4d06c4c7b6
Merge commit '43aec5ad^' into merge-2.4
...
Conflicts:
modules/contrib/src/inputoutput.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpuarithm/perf/perf_element_operations.cpp
modules/gpuarithm/src/element_operations.cpp
modules/ts/src/precomp.hpp
12 years ago
0daac6fd9d
Merge pull request #1327 from alalek:ocl_master_tests_fix
12 years ago
f44ed7f37c
Merge pull request #1340 from SpecLad:python-updates
12 years ago
055a581977
Moved Sphinx detection outside of the PYTHONINTERP_FOUND block.
...
Who knows, maybe the user's Sphinx installation uses a Python we couldn't find.
12 years ago
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
12 years ago
dbb684b85f
Bumped minimal Python version to 2.6.
...
Rationale: we already depend on it (e.g. some scripts use print_function).
12 years ago
1a81da012d
Removed old Python detection cruft.
...
None of this should be relevant as of CMake 2.8.7.
12 years ago
580677f43d
Merge pull request #1304 from berak:doc_tut_cascade
12 years ago
365def6090
Merge pull request #1323 from SpecLad:find-git
12 years ago
5a32f0b6ca
Merge pull request #1322 from SpecLad:terse
12 years ago
66aa3255b9
Merge pull request #1328 from SpecLad:zlib-update
12 years ago
7685b983db
OCL: tests: repair moments implementation in master branch, enable tests
12 years ago
50288f1314
rebased commits
12 years ago
926d6876d3
using VideoCapture instead of CvCapture* in cascade tutorial
...
corrected constants, changed objdetection.cpp as well
updated objDetection2.cpp as well
fixed headers in objdetection2.cpp
removed useles RNG
fixed buildbot warnings (wow, i like that bot!)
victim of the war on whitespace
fixing buildbot warnings
fixing last buildbot warning, heya .
trying to rebase/squash commits
12 years ago
9c01a96b14
Set minimal zlib version to 1.2.3.
...
Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.
12 years ago
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
12 years ago
797beef383
Updated zlib to 1.2.8.
12 years ago
b7b584984e
OCL: tests: repair/disable failed tests in ocl module
12 years ago
880306f6d6
Don't search for Git ourselves - CMake can handle it now.
12 years ago
e45526b9c0
Dropped the CMAKE_VERBOSE option.
...
There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.
12 years ago
9c60a2c24c
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
12 years ago
ad7073bc22
Merge pull request #1305 from SpecLad:perf-precomp
12 years ago
ebb6c842f9
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
12 years ago
b15addec70
C4447 warning about main function format suppressed.
12 years ago
d62c98527a
Invalid usage of cv::Ptr for arrays fixed.
12 years ago
1a7c2eefb8
Merge pull request #1306 from jet47:gpu-bitwize-fix
12 years ago
893e8b4371
Merge pull request #942 from achalddave:patch-1
12 years ago
868e355e33
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
12 years ago
84a9755597
Merge pull request #1215 from jet47:cuda-5.5-sanity
12 years ago
ea5dd74af1
Add IPP 8.0 support in FindIPP script
12 years ago
7831a2d45c
Merge pull request #1314 from jet47:ts-gpu-fix
12 years ago
2899d558ac
record cuda gpu name to output report
12 years ago
b7ec673001
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
12 years ago
a1b633e28e
Merge pull request #1298 from jet47:gpu-eliminate-doubles
12 years ago
cb2985c526
fixed gpu bitwize operation:
...
incorrect types for template instantiation
12 years ago
9667a8a1ae
Fix the name of perf tests' precompiled header.
...
(cherry picked from commit aa96d8d053
12 years ago
beada19ad0
Merge pull request #1297 from SpecLad:merge-2.4
12 years ago
aa96d8d053
Fix the name of perf tests' precompiled header.
12 years ago
adc1dd2799
Merge pull request #1301 from asmorkalov:java_video_capture_fix
12 years ago
f76dd99299
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
12 years ago
e37f7a4c73
Typo in Java generator fixed.
...
Typo breaks debug build for Android platform.
12 years ago
cd2b7448f4
eliminate unnecessary double arithmetics in CUDA
12 years ago
abf372d759
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
12 years ago
0b270e2b08
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
12 years ago
3fc1885f48
Merge pull request #1294 from jet47:gpu-tests-fix
12 years ago
70fffa48e5
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
12 years ago
7bda6992e5
fixed gpu BGR <-> YUV color conversion
12 years ago
9f33de7071
added cvconfig.hpp header file to gpu tests
...
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
12 years ago
bed3512dd5
Merge pull request #1288 from nghiaho12:haar
12 years ago
473ca0849d
Merge pull request #1285 from SpecLad:enum-compare
12 years ago
Roman Donchenko
Alexander Alekhin
berak
Alexander Smorkalov
kdrobnyh
Vladislav Vinogradov