Merge pull request #1298 from jet47:gpu-eliminate-doubles

Merge pull request #1297 from SpecLad:merge-2.4

Fix the name of perf tests' precompiled header.

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp

eliminate unnecessary double arithmetics in CUDA

Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master

Merge pull request #1294 from jet47:gpu-tests-fix

fixed gpu BGR <-> YUV color conversion

added cvconfig.hpp header file to gpu tests

it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses

Merge pull request #1288 from nghiaho12:haar

Merge pull request #1285 from SpecLad:enum-compare

Buffer is accessed out of bounds.

Merge pull request #1286 from SpecLad:optflow-sf-init

Merge pull request #1277 from NCBee:2.4

Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp

Merge pull request #1280 from asmorkalov:winrt_detect_fix

Merge pull request #1257 from SpecLad:merge-2.4

WindowsRT availability check reorganized. Build script updated.

Merge pull request #1284 from melody-rain:superres_example_2

In calcOpticalFlowSF, fixed several uninitialized uses of matrices.

This should fix that pesky test failure that pops up from time to time.

I don't actually know if the default values should be zeros, but the tests
pass, so...

Merge branch 'master' into merge-2.4

Conflicts:
modules/photo/doc/inpainting.rst

Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix

Merge pull request #1279 from asmorkalov:ocv_opt_tabs

Fixed a -Wenum-compare warning in cudev.

Merge pull request #1152 from StevenPuttemans:bugfix_2795

1. Added OpenCL version of superres to the sample.
2. Modified according to the feedback of the community.

Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix

All optimized function tables wrapped to getters to change its
initialization time.

Merge pull request #1258 from apavlenko:java_video_capture

restoring binary compatibility

Merge pull request #1275 from rdm12:bug_1922

Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
for libpng added.

applied comments after review

Merge pull request #1276 from nghiaho12:mushroom

Merge pull request #1253 from kamjagin:fixingCompilationOnOSX

Minor bug fix, missing const in method signature

Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196

adding std to cstdint typedef of uint32_t

defined uint for non-windows platforms too. replaced isnan for cvIsNaN.

Merge pull request #1265 from abidrahmank:misc_docs2

Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4

Merge pull request #1270 from rdm12:bugfix_3094

bug #1922: restored most of the class definitions in basic_structures.rst

Fixed mismatching allocation and deallocation: el_ptr

Merge pull request #1254 from pengx17:2.4_filter2d_

Merge pull request #1186 from SpecLad:dont-export-templates

missed # in if defined

added HAVE_QTKIT to tests

Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME

bug #3094: added CV_Assert to PyrDown_ to check if source matrix is not empty

Merge pull request #1149 from jet47:generalized-hough-refactoring

Merge pull request #1263 from abidrahmank:pyCLAHE_24

Merge pull request #1262 from StevenPuttemans:fix_surf_tutorial

Merge pull request #1245 from rdm12:doc_tutorial_camera_calibration

Merge pull request #1162 from jet47:cudev-integration

Update with apavlenko's suggestions.

docs changes

docs changes

CLAHE Python bindings

Merge pull request #1259 from pengx17:2.4_fix_cvtcolor

Merge pull request #1255 from SpecLad:no-cr

Missing including of nonfree module to support the use of SURF
detector/descriptor.

Merge pull request #1260 from SpecLad:no-cr-master

LinkedList -> ArrayList

Adjusted the camera calibration sample to master API.

Merge pull request #1256 from kamjagin:2.4

Fixed CR line endings in non_linear_svms.rst.

also fixing JNI library name in JUnit tests

Apply bugfix #3121 for OCL.

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml

Fixed elif/elseif error that made highgui-windows fail on mac+cocoa.

enabling of VideoCapture(String) [fixing issue #3207]
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.

Merge pull request #1250 from denzp:opencl_detection_unix

Let ocl::filter2D support kernel size >= 3.

properly set OpenCL lib search path

Don't put \r into OPENCV_REFMAN_TOC.

There's no need, since configure_file writes its output using native
line endings, anyway.

Merge pull request #1251 from StevenPuttemans:bugfix_3209

Merge pull request #1241 from SpecLad:redundant-precomps

Merge pull request #1238 from SpecLad:cmake-min-ver

Inlined the getMD5 macro, which no longer saves us anything.

Merge pull request #1242 from asmorkalov:android_native_cam

Merge pull request #1235 from WonderRico:bugfix_dshow

Added bugfix 3209 : anchor point (-1,1) changed to (-1,-1)

fix _index / index

Merge pull request #1247 from StevenPuttemans:bugfix_3205

Merge pull request #1163 from kdrobnyh:Morphology

Added fixes mentioned in #3205 : changing uint to unsigned literals for compilation on Mingw 4.7.2

Merge pull request #1246 from StevenPuttemans:bugfix_3206

Added fix mentioned in bug #3206
VideoWriter memory leak solved.

bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140)

fix formating

Merge pull request #1239 from Daniil-Osokin:fix_build_of_camera_calibration_android_sample

Native camera libraries updated.

Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.

Merge pull request #1244 from vkocheganov:bugfix_3179

Minor language corrections in the tutorial document

Fix unsequenced modifications (Bug #3179).

Renamed ocl tests' precomp files according to convention.

Also, added the missing include guard to perf_precomp.hpp.
This should fix the build.

Made it so that a dummy .cpp is actually created when compiling with VC++.

Deleted almost all of the precomp.cpp files.

Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.

Removed extra {} in erosion and dilation functions