Roman Donchenko
0daac6fd9d
Merge pull request #1327 from alalek:ocl_master_tests_fix
11 years ago
Roman Donchenko
f44ed7f37c
Merge pull request #1340 from SpecLad:python-updates
11 years ago
Roman Donchenko
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.
11 years ago
Roman Donchenko
67ae438dae
Refactored NumPy detection.
...
Most importantly, added support for multiple include directores,
but also did some general cleanup.
11 years ago
Roman Donchenko
dbb684b85f
Bumped minimal Python version to 2.6.
...
Rationale: we already depend on it (e.g. some scripts use print_function).
11 years ago
Roman Donchenko
1a81da012d
Removed old Python detection cruft.
...
None of this should be relevant as of CMake 2.8.7.
11 years ago
Roman Donchenko
580677f43d
Merge pull request #1304 from berak:doc_tut_cascade
11 years ago
Roman Donchenko
365def6090
Merge pull request #1323 from SpecLad:find-git
11 years ago
Roman Donchenko
5a32f0b6ca
Merge pull request #1322 from SpecLad:terse
11 years ago
Roman Donchenko
66aa3255b9
Merge pull request #1328 from SpecLad:zlib-update
11 years ago
Alexander Alekhin
7685b983db
OCL: tests: repair moments implementation in master branch, enable tests
11 years ago
berak
50288f1314
rebased commits
11 years ago
berak
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
11 years ago
Roman Donchenko
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.
11 years ago
Roman Donchenko
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.
11 years ago
Roman Donchenko
797beef383
Updated zlib to 1.2.8.
11 years ago
Alexander Alekhin
b7b584984e
OCL: tests: repair/disable failed tests in ocl module
11 years ago
Roman Donchenko
880306f6d6
Don't search for Git ourselves - CMake can handle it now.
11 years ago
Roman Donchenko
e45526b9c0
Dropped the CMAKE_VERBOSE option.
...
There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.
11 years ago
Roman Donchenko
893e8b4371
Merge pull request #942 from achalddave:patch-1
11 years ago
Roman Donchenko
a1b633e28e
Merge pull request #1298 from jet47:gpu-eliminate-doubles
11 years ago
Roman Donchenko
beada19ad0
Merge pull request #1297 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
aa96d8d053
Fix the name of perf tests' precompiled header.
11 years ago
Roman Donchenko
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
11 years ago
Vladislav Vinogradov
cd2b7448f4
eliminate unnecessary double arithmetics in CUDA
11 years ago
Roman Donchenko
0b270e2b08
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
11 years ago
Roman Donchenko
3fc1885f48
Merge pull request #1294 from jet47:gpu-tests-fix
11 years ago
Vladislav Vinogradov
7bda6992e5
fixed gpu BGR <-> YUV color conversion
11 years ago
Vladislav Vinogradov
9f33de7071
added cvconfig.hpp header file to gpu tests
...
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
11 years ago
Roman Donchenko
bed3512dd5
Merge pull request #1288 from nghiaho12:haar
11 years ago
Roman Donchenko
473ca0849d
Merge pull request #1285 from SpecLad:enum-compare
11 years ago
Nghia Ho
c6858c3fb0
Buffer is accessed out of bounds.
11 years ago
Roman Donchenko
449b99a6d7
Merge pull request #1286 from SpecLad:optflow-sf-init
11 years ago
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
11 years ago
Bahram Dahi
230bc03d97
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
11 years ago
Roman Donchenko
e8f85903c5
Merge pull request #1280 from asmorkalov:winrt_detect_fix
11 years ago
Roman Donchenko
2349f7ea89
Merge pull request #1257 from SpecLad:merge-2.4
11 years ago
Alexander Smorkalov
ddbeac503c
WindowsRT availability check reorganized. Build script updated.
11 years ago
Roman Donchenko
5ca1b559a8
Merge pull request #1284 from melody-rain:superres_example_2
11 years ago
Roman Donchenko
7d768d2159
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...
11 years ago
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
11 years ago
Roman Donchenko
47b3e7855f
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
11 years ago
Roman Donchenko
a3bbb3dd3d
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
11 years ago
Roman Donchenko
2304a561ca
Fixed a -Wenum-compare warning in cudev.
11 years ago
Roman Donchenko
46fb737bdc
Merge pull request #1152 from StevenPuttemans:bugfix_2795
11 years ago
Jin Ma
8fb6b689c6
1. Added OpenCL version of superres to the sample.
...
2. Modified according to the feedback of the community.
11 years ago
Roman Donchenko
ac8506db32
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
11 years ago
Alexander Smorkalov
a3dd13450c
All optimized function tables wrapped to getters to change its
...
initialization time.
11 years ago
Roman Donchenko
35cb59bb22
Merge pull request #1258 from apavlenko:java_video_capture
11 years ago
Andrey Pavlenko
5a9bd3f080
restoring binary compatibility
11 years ago