Roman Donchenko [Wed, 28 Aug 2013 08:00:39 +0000 (12:00 +0400)]
Merge pull request #1342 from nevion:master
Roman Donchenko [Wed, 28 Aug 2013 07:44:40 +0000 (11:44 +0400)]
Merge pull request #1248 from vkocheganov:chi_square_alt
Roman Donchenko [Tue, 27 Aug 2013 13:47:55 +0000 (17:47 +0400)]
Merge pull request #1341 from roynos:master
Roman Donchenko [Tue, 27 Aug 2013 08:43:34 +0000 (12:43 +0400)]
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
Roman Donchenko [Tue, 27 Aug 2013 08:37:32 +0000 (12:37 +0400)]
Merge pull request #1339 from mdim:ml_cpp_wrappers_fix
Jason Newton [Tue, 27 Aug 2013 07:34:22 +0000 (00:34 -0700)]
correct range computations, it is difficult to do the more efficient single pass 3N/2 implementations correctly in this particular setting without costing more than they save
Roman Donchenko [Mon, 26 Aug 2013 12:44:37 +0000 (16:44 +0400)]
Merge pull request #1327 from alalek:ocl_master_tests_fix
Roman Donchenko [Mon, 26 Aug 2013 12:41:13 +0000 (16:41 +0400)]
Merge pull request #1340 from SpecLad:python-updates
Roy Reapor [Mon, 26 Aug 2013 02:55:00 +0000 (19:55 -0700)]
Ignore Windows' Thumbs.db
Roman Donchenko [Fri, 23 Aug 2013 14:43:06 +0000 (18:43 +0400)]
Moved Sphinx detection outside of the PYTHONINTERP_FOUND block.
Who knows, maybe the user's Sphinx installation uses a Python we couldn't find.
Roman Donchenko [Fri, 23 Aug 2013 14:41:13 +0000 (18:41 +0400)]
Refactored NumPy detection.
Most importantly, added support for multiple include directores,
but also did some general cleanup.
Roman Donchenko [Fri, 23 Aug 2013 14:31:51 +0000 (18:31 +0400)]
Bumped minimal Python version to 2.6.
Rationale: we already depend on it (e.g. some scripts use print_function).
Roman Donchenko [Fri, 23 Aug 2013 14:24:02 +0000 (18:24 +0400)]
Removed old Python detection cruft.
None of this should be relevant as of CMake 2.8.7.
Maria Dimashova [Fri, 23 Aug 2013 14:13:10 +0000 (18:13 +0400)]
fixed cpp wrappers of ML tree-based models
Roman Donchenko [Fri, 23 Aug 2013 11:18:05 +0000 (15:18 +0400)]
Merge pull request #1304 from berak:doc_tut_cascade
Roman Donchenko [Fri, 23 Aug 2013 10:48:21 +0000 (14:48 +0400)]
Merge pull request #1323 from SpecLad:find-git
Roman Donchenko [Fri, 23 Aug 2013 08:11:41 +0000 (12:11 +0400)]
Merge pull request #1322 from SpecLad:terse
Roman Donchenko [Fri, 23 Aug 2013 08:06:16 +0000 (12:06 +0400)]
Merge pull request #1328 from SpecLad:zlib-update
Changlin Hsieh [Fri, 23 Aug 2013 08:05:35 +0000 (16:05 +0800)]
Update cmake files by using CUDA_CUDA_LIBRARIES
Alexander Alekhin [Thu, 22 Aug 2013 19:33:11 +0000 (23:33 +0400)]
OCL: tests: repair moments implementation in master branch, enable tests
berak [Thu, 22 Aug 2013 16:16:54 +0000 (18:16 +0200)]
rebased commits
berak [Tue, 20 Aug 2013 08:56:57 +0000 (10:56 +0200)]
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
Roman Donchenko [Thu, 22 Aug 2013 14:06:07 +0000 (18:06 +0400)]
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.
Roman Donchenko [Thu, 22 Aug 2013 14:04:50 +0000 (18:04 +0400)]
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.
Roman Donchenko [Thu, 22 Aug 2013 13:59:27 +0000 (17:59 +0400)]
Updated zlib to 1.2.8.
Alexander Alekhin [Wed, 21 Aug 2013 13:12:55 +0000 (17:12 +0400)]
OCL: tests: repair/disable failed tests in ocl module
Roman Donchenko [Thu, 22 Aug 2013 09:28:17 +0000 (13:28 +0400)]
Don't search for Git ourselves - CMake can handle it now.
Roman Donchenko [Thu, 22 Aug 2013 08:41:14 +0000 (12:41 +0400)]
Dropped the CMAKE_VERBOSE option.
There's no reason for it to exist, since it just duplicates the
CMAKE_VERBOSE_MAKEFILE variable.
Roman Donchenko [Wed, 21 Aug 2013 12:06:27 +0000 (16:06 +0400)]
Merge pull request #942 from achalddave:patch-1
Roman Donchenko [Tue, 20 Aug 2013 14:04:54 +0000 (18:04 +0400)]
Merge pull request #1298 from jet47:gpu-eliminate-doubles
Roman Donchenko [Tue, 20 Aug 2013 10:10:21 +0000 (14:10 +0400)]
Merge pull request #1297 from SpecLad:merge-2.4
Roman Donchenko [Tue, 20 Aug 2013 08:51:33 +0000 (12:51 +0400)]
Fix the name of perf tests' precompiled header.
Roman Donchenko [Mon, 19 Aug 2013 10:08:34 +0000 (14:08 +0400)]
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
Vladislav Vinogradov [Thu, 30 May 2013 09:10:11 +0000 (13:10 +0400)]
eliminate unnecessary double arithmetics in CUDA
Roman Donchenko [Mon, 19 Aug 2013 10:26:12 +0000 (14:26 +0400)]
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
Roman Donchenko [Mon, 19 Aug 2013 10:21:50 +0000 (14:21 +0400)]
Merge pull request #1294 from jet47:gpu-tests-fix
Vladislav Vinogradov [Mon, 19 Aug 2013 09:17:55 +0000 (13:17 +0400)]
fixed gpu BGR <-> YUV color conversion
Vladislav Vinogradov [Mon, 19 Aug 2013 08:46:57 +0000 (12:46 +0400)]
added cvconfig.hpp header file to gpu tests
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
Roman Donchenko [Mon, 19 Aug 2013 08:04:24 +0000 (12:04 +0400)]
Merge pull request #1288 from nghiaho12:haar
Roman Donchenko [Mon, 19 Aug 2013 08:00:18 +0000 (12:00 +0400)]
Merge pull request #1285 from SpecLad:enum-compare
Nghia Ho [Sat, 17 Aug 2013 10:32:13 +0000 (20:32 +1000)]
Buffer is accessed out of bounds.
Roman Donchenko [Fri, 16 Aug 2013 15:59:26 +0000 (19:59 +0400)]
Merge pull request #1286 from SpecLad:optflow-sf-init
Roman Donchenko [Fri, 16 Aug 2013 15:59:12 +0000 (19:59 +0400)]
Merge pull request #1277 from NCBee:2.4
Bahram Dahi [Fri, 16 Aug 2013 15:14:32 +0000 (08:14 -0700)]
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
Roman Donchenko [Fri, 16 Aug 2013 15:03:45 +0000 (19:03 +0400)]
Merge pull request #1280 from asmorkalov:winrt_detect_fix
Roman Donchenko [Fri, 16 Aug 2013 14:42:17 +0000 (18:42 +0400)]
Merge pull request #1257 from SpecLad:merge-2.4
Alexander Smorkalov [Thu, 15 Aug 2013 13:01:38 +0000 (06:01 -0700)]
WindowsRT availability check reorganized. Build script updated.
Roman Donchenko [Fri, 16 Aug 2013 12:07:41 +0000 (16:07 +0400)]
Merge pull request #1284 from melody-rain:superres_example_2
Roman Donchenko [Fri, 16 Aug 2013 10:43:18 +0000 (14:43 +0400)]
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...
Roman Donchenko [Fri, 16 Aug 2013 10:14:12 +0000 (14:14 +0400)]
Merge branch 'master' into merge-2.4
Conflicts:
modules/photo/doc/inpainting.rst
Roman Donchenko [Fri, 16 Aug 2013 10:05:39 +0000 (14:05 +0400)]
Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix
Roman Donchenko [Fri, 16 Aug 2013 09:58:13 +0000 (13:58 +0400)]
Merge pull request #1279 from asmorkalov:ocv_opt_tabs
Roman Donchenko [Fri, 16 Aug 2013 09:53:37 +0000 (13:53 +0400)]
Fixed a -Wenum-compare warning in cudev.
Roman Donchenko [Fri, 16 Aug 2013 08:52:47 +0000 (12:52 +0400)]
Merge pull request #1152 from StevenPuttemans:bugfix_2795
Jin Ma [Fri, 16 Aug 2013 08:30:40 +0000 (16:30 +0800)]
1. Added OpenCL version of superres to the sample.
2. Modified according to the feedback of the community.
Roman Donchenko [Fri, 16 Aug 2013 08:22:18 +0000 (12:22 +0400)]
Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
Alexander Smorkalov [Thu, 15 Aug 2013 07:01:40 +0000 (00:01 -0700)]
All optimized function tables wrapped to getters to change its
initialization time.
Roman Donchenko [Fri, 16 Aug 2013 08:05:12 +0000 (12:05 +0400)]
Merge pull request #1258 from apavlenko:java_video_capture
Andrey Pavlenko [Thu, 15 Aug 2013 19:49:32 +0000 (23:49 +0400)]
restoring binary compatibility
Roman Donchenko [Thu, 15 Aug 2013 15:12:23 +0000 (19:12 +0400)]
Merge pull request #1275 from rdm12:bug_1922
Alexander Smorkalov [Mon, 12 Aug 2013 13:30:40 +0000 (06:30 -0700)]
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch
for libpng added.
Dmitry Retinskiy [Thu, 15 Aug 2013 12:18:01 +0000 (16:18 +0400)]
applied comments after review
Roman Donchenko [Thu, 15 Aug 2013 08:05:01 +0000 (12:05 +0400)]
Merge pull request #1276 from nghiaho12:mushroom
Roman Donchenko [Thu, 15 Aug 2013 07:54:54 +0000 (11:54 +0400)]
Merge pull request #1253 from kamjagin:fixingCompilationOnOSX
Bahram Dahi [Wed, 14 Aug 2013 22:54:13 +0000 (15:54 -0700)]
Minor bug fix, missing const in method signature
Bahram Dahi [Wed, 14 Aug 2013 22:08:34 +0000 (15:08 -0700)]
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
kamjagin [Wed, 14 Aug 2013 09:25:49 +0000 (11:25 +0200)]
adding std to cstdint typedef of uint32_t
Miroslav Kobetski [Mon, 12 Aug 2013 18:08:06 +0000 (20:08 +0200)]
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
Roman Donchenko [Wed, 14 Aug 2013 15:03:44 +0000 (19:03 +0400)]
Merge pull request #1265 from abidrahmank:misc_docs2
Roman Donchenko [Wed, 14 Aug 2013 14:50:26 +0000 (18:50 +0400)]
Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4
Roman Donchenko [Wed, 14 Aug 2013 14:49:38 +0000 (18:49 +0400)]
Merge pull request #1270 from rdm12:bugfix_3094
Dmitry Retinskiy [Wed, 14 Aug 2013 13:08:58 +0000 (17:08 +0400)]
bug #1922: restored most of the class definitions in basic_structures.rst
Nghia Ho [Wed, 14 Aug 2013 13:36:29 +0000 (23:36 +1000)]
Fixed mismatching allocation and deallocation: el_ptr
Roman Donchenko [Wed, 14 Aug 2013 13:27:17 +0000 (17:27 +0400)]
Merge pull request #1254 from pengx17:2.4_filter2d_
Roman Donchenko [Wed, 14 Aug 2013 13:25:01 +0000 (17:25 +0400)]
Merge pull request #1186 from SpecLad:dont-export-templates
kamjagin [Wed, 14 Aug 2013 12:25:46 +0000 (14:25 +0200)]
missed # in if defined
kamjagin [Wed, 14 Aug 2013 11:40:50 +0000 (13:40 +0200)]
added HAVE_QTKIT to tests
kamjagin [Wed, 14 Aug 2013 11:33:47 +0000 (13:33 +0200)]
Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME
Dmitry Retinskiy [Wed, 14 Aug 2013 11:30:35 +0000 (15:30 +0400)]
bug #3094: added CV_Assert to PyrDown_ to check if source matrix is not empty
Roman Donchenko [Wed, 14 Aug 2013 09:26:23 +0000 (13:26 +0400)]
Merge pull request #1149 from jet47:generalized-hough-refactoring
Changlin Hsieh [Wed, 14 Aug 2013 08:16:03 +0000 (16:16 +0800)]
Fix GPU example build failed with cuda 5.5
Roman Donchenko [Wed, 14 Aug 2013 08:10:21 +0000 (12:10 +0400)]
Merge pull request #1263 from abidrahmank:pyCLAHE_24
Roman Donchenko [Wed, 14 Aug 2013 08:08:58 +0000 (12:08 +0400)]
Merge pull request #1262 from StevenPuttemans:fix_surf_tutorial
Roman Donchenko [Wed, 14 Aug 2013 08:07:25 +0000 (12:07 +0400)]
Merge pull request #1245 from rdm12:doc_tutorial_camera_calibration
Roman Donchenko [Wed, 14 Aug 2013 08:00:33 +0000 (12:00 +0400)]
Merge pull request #1162 from jet47:cudev-integration
Achal Dave [Sat, 1 Jun 2013 00:34:20 +0000 (18:34 -0600)]
Comparing rejected stage index with minimum required neighbors does not make sense
As described here, http://code.opencv.org/issues/3064, the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
peng xiao [Wed, 14 Aug 2013 02:00:09 +0000 (10:00 +0800)]
Update with apavlenko's suggestions.
abidrahmank [Tue, 13 Aug 2013 16:37:44 +0000 (22:07 +0530)]
docs changes
abidrahmank [Tue, 13 Aug 2013 16:28:49 +0000 (21:58 +0530)]
docs changes
abidrahmank [Tue, 13 Aug 2013 14:21:32 +0000 (19:51 +0530)]
CLAHE Python bindings
Roman Donchenko [Tue, 13 Aug 2013 12:34:18 +0000 (16:34 +0400)]
Merge pull request #1259 from pengx17:2.4_fix_cvtcolor
Roman Donchenko [Tue, 13 Aug 2013 12:33:54 +0000 (16:33 +0400)]
Merge pull request #1255 from SpecLad:no-cr
StevenPuttemans [Tue, 13 Aug 2013 12:12:57 +0000 (14:12 +0200)]
Missing including of nonfree module to support the use of SURF
detector/descriptor.
Roman Donchenko [Tue, 13 Aug 2013 12:00:20 +0000 (16:00 +0400)]
Merge pull request #1260 from SpecLad:no-cr-master
Andrey Pavlenko [Tue, 13 Aug 2013 11:51:37 +0000 (15:51 +0400)]
LinkedList -> ArrayList
Roman Donchenko [Tue, 13 Aug 2013 10:55:27 +0000 (14:55 +0400)]
Adjusted the camera calibration sample to master API.
Roman Donchenko [Tue, 13 Aug 2013 09:37:09 +0000 (13:37 +0400)]
Merge pull request #1256 from kamjagin:2.4
Roman Donchenko [Tue, 13 Aug 2013 09:29:09 +0000 (13:29 +0400)]
Fixed CR line endings in non_linear_svms.rst.
Andrey Pavlenko [Tue, 13 Aug 2013 09:18:01 +0000 (13:18 +0400)]
also fixing JNI library name in JUnit tests
peng xiao [Tue, 13 Aug 2013 09:17:07 +0000 (17:17 +0800)]
Apply bugfix #3121 for OCL.