[opencv] 84/251: Merge pull request #9130 from alalek:android_define

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 5a54acef4e093f3f7cb9f6a54010d7f1247774c6
Merge: e5fbb4f a4a47b5
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Fri Jul 14 17:17:24 2017 +0000

    Merge pull request #9130 from alalek:android_define

 3rdparty/carotene/src/channel_extract.cpp          | 12 +++++------
 3rdparty/carotene/src/channels_combine.cpp         |  8 ++++----
 3rdparty/carotene/src/flip.cpp                     |  8 ++++----
 3rdparty/carotene/src/resize.cpp                   | 24 +++++++++++-----------
 modules/core/src/opengl.cpp                        |  4 ++--
 modules/core/src/parallel.cpp                      |  6 +++---
 modules/core/src/parallel_pthreads.cpp             |  2 +-
 modules/core/src/stat.cpp                          |  6 +++---
 modules/core/src/system.cpp                        | 12 +++++------
 modules/core/test/ocl/test_arithm.cpp              |  2 +-
 .../test/ocl/test_brute_force_matcher.cpp          |  6 +++---
 modules/imgcodecs/test/test_tiff.cpp               |  2 +-
 modules/imgproc/perf/perf_resize.cpp               |  4 ++--
 modules/imgproc/perf/perf_warp.cpp                 | 10 ++++-----
 modules/imgproc/src/filter.cpp                     |  4 ++--
 modules/imgproc/src/morph.cpp                      |  4 ++--
 modules/imgproc/src/smooth.cpp                     |  2 +-
 modules/imgproc/test/ocl/test_warp.cpp             |  2 +-
 modules/objdetect/src/detection_based_tracker.cpp  |  4 ++--
 modules/stitching/src/util_log.hpp                 |  2 +-
 modules/ts/include/opencv2/ts/ts_perf.hpp          |  2 +-
 modules/ts/src/cuda_perf.cpp                       |  2 +-
 modules/ts/src/ts_perf.cpp                         | 14 ++++++-------
 modules/video/src/optflowgf.cpp                    |  2 +-
 modules/videoio/src/cap_ffmpeg_impl.hpp            |  2 +-
 25 files changed, 73 insertions(+), 73 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git