platform/upstream/opencv.git
11 years agoMerge pull request #438 from bitwangyaoyao:2.4_fixwarings
Andrey Kamaev [Wed, 6 Feb 2013 10:04:27 +0000 (14:04 +0400)]
Merge pull request #438 from bitwangyaoyao:2.4_fixwarings

11 years agoMerge pull request #432 from bitwangyaoyao:2.4_blend
Andrey Kamaev [Tue, 5 Feb 2013 10:53:49 +0000 (14:53 +0400)]
Merge pull request #432 from bitwangyaoyao:2.4_blend

11 years agoMerge pull request #431 from snosov1:matchTemplate-tegra
Andrey Kamaev [Tue, 5 Feb 2013 10:50:15 +0000 (14:50 +0400)]
Merge pull request #431 from snosov1:matchTemplate-tegra

11 years agoremove a warning on Linux
yao [Tue, 5 Feb 2013 09:16:40 +0000 (17:16 +0800)]
remove a warning on Linux
fix a error in doc

11 years agoMerge pull request #427 from vrabaud:brisk_fixes_2.4
Andrey Kamaev [Mon, 4 Feb 2013 13:10:02 +0000 (17:10 +0400)]
Merge pull request #427 from vrabaud:brisk_fixes_2.4

11 years agostricter eps for normed methods
Sergei Nosov [Mon, 4 Feb 2013 09:29:52 +0000 (13:29 +0400)]
stricter eps for normed methods

11 years agoMerge pull request #404 from asmorkalov:android_opencvmk_fix
Andrey Kamaev [Mon, 4 Feb 2013 11:49:48 +0000 (15:49 +0400)]
Merge pull request #404 from asmorkalov:android_opencvmk_fix

11 years agoMerge pull request #408 from asmorkalov:giganetix_cams_patch
Andrey Kamaev [Mon, 4 Feb 2013 10:56:54 +0000 (14:56 +0400)]
Merge pull request #408 from asmorkalov:giganetix_cams_patch

11 years agodefine the default remapping in the right scope
Vincent Rabaud [Sun, 3 Feb 2013 13:31:59 +0000 (14:31 +0100)]
define the default remapping in the right scope

11 years agowrite documentation for BRISK
Vincent Rabaud [Sun, 3 Feb 2013 13:31:15 +0000 (14:31 +0100)]
write documentation for  BRISK

11 years agoblend use vector to optimize
yao [Mon, 4 Feb 2013 09:29:20 +0000 (17:29 +0800)]
blend use vector to optimize

11 years agomatchTemplate perf tests added
Sergei Nosov [Mon, 4 Feb 2013 08:57:22 +0000 (12:57 +0400)]
matchTemplate perf tests added

11 years agoenable Tegra optimizations
Sergei Nosov [Mon, 4 Feb 2013 08:57:03 +0000 (12:57 +0400)]
enable Tegra optimizations

11 years agoMerge pull request #420 from asmaloney:check-mem-alloc
Andrey Kamaev [Mon, 4 Feb 2013 08:56:35 +0000 (12:56 +0400)]
Merge pull request #420 from asmaloney:check-mem-alloc

11 years agoModules redifinition in case of multiple includes of OpenCV.mk in single Android...
Alexander Smorkalov [Fri, 1 Feb 2013 09:15:39 +0000 (13:15 +0400)]
Modules redifinition in case of multiple includes of OpenCV.mk in single Android.mk fixed.

11 years agoMerge pull request #429 from bitwangyaoyao:2.4_setdevEx
Andrey Kamaev [Mon, 4 Feb 2013 08:03:24 +0000 (12:03 +0400)]
Merge pull request #429 from bitwangyaoyao:2.4_setdevEx

11 years agoMerge pull request #425 from asmaloney:vector_empty
Andrey Kamaev [Mon, 4 Feb 2013 08:03:03 +0000 (12:03 +0400)]
Merge pull request #425 from asmaloney:vector_empty

11 years agoMerge pull request #424 from asmaloney:additional-checks
Andrey Kamaev [Mon, 4 Feb 2013 08:02:43 +0000 (12:02 +0400)]
Merge pull request #424 from asmaloney:additional-checks

11 years agoMerge pull request #421 from asmaloney:check-mem-alloc2
Andrey Kamaev [Mon, 4 Feb 2013 08:02:27 +0000 (12:02 +0400)]
Merge pull request #421 from asmaloney:check-mem-alloc2

11 years agoMerge pull request #410 from taka-no-me:fix_cap_dshow_setfps
Andrey Kamaev [Mon, 4 Feb 2013 07:57:32 +0000 (11:57 +0400)]
Merge pull request #410 from taka-no-me:fix_cap_dshow_setfps

11 years agoMerge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4
Andrey Kamaev [Mon, 4 Feb 2013 07:54:43 +0000 (11:54 +0400)]
Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4

11 years agoadd setDeviceEx interface
yao [Mon, 4 Feb 2013 07:06:36 +0000 (15:06 +0800)]
add setDeviceEx interface
simplify the logic of save binary

11 years agoNo need to check vector size before clear()
Andy Maloney [Sun, 3 Feb 2013 00:00:41 +0000 (19:00 -0500)]
No need to check vector size before clear()

11 years agoRemove unused constructor
Andy Maloney [Sat, 2 Feb 2013 21:09:10 +0000 (16:09 -0500)]
Remove unused constructor
Add checks for valid values
Fix wording on some errors

11 years agoCheck memory allocation
Andy Maloney [Sat, 2 Feb 2013 13:44:25 +0000 (08:44 -0500)]
Check memory allocation
Declare vars as locally as possible

11 years agoCheck memory allocation
Andy Maloney [Sat, 2 Feb 2013 13:33:40 +0000 (08:33 -0500)]
Check memory allocation
Initialize local variables

11 years agoMerge pull request #414 from asmaloney:remove-unused-vars2
Andrey Kamaev [Sat, 2 Feb 2013 10:34:47 +0000 (14:34 +0400)]
Merge pull request #414 from asmaloney:remove-unused-vars2

11 years agoMerge pull request #415 from asmaloney:cvCopyHist-fix
Andrey Kamaev [Sat, 2 Feb 2013 10:34:33 +0000 (14:34 +0400)]
Merge pull request #415 from asmaloney:cvCopyHist-fix

11 years agoFix subtle bug when src & dst agree on sparsity but have different dimensions
Andy Maloney [Sat, 2 Feb 2013 03:57:22 +0000 (22:57 -0500)]
Fix subtle bug when src & dst agree on sparsity but have different dimensions
Remove unused var "total"
Declare vars as locally as possible

11 years agoRemove unused vars
Andy Maloney [Fri, 1 Feb 2013 23:09:58 +0000 (18:09 -0500)]
Remove unused vars

11 years agoFix setting of FPS after frame width and height with DShow cameras
Andrey Kamaev [Fri, 1 Feb 2013 14:01:13 +0000 (18:01 +0400)]
Fix setting of FPS after frame width and height with DShow cameras

Issue #2114

11 years agoMerge pull request #407 from taka-no-me:fix_java_after_surf_change
cuda-geek [Fri, 1 Feb 2013 13:48:20 +0000 (17:48 +0400)]
Merge pull request #407 from taka-no-me:fix_java_after_surf_change

11 years agoUpdate regression checks in Java test
Andrey Kamaev [Fri, 1 Feb 2013 10:37:24 +0000 (14:37 +0400)]
Update regression checks in Java test

This follows SURF changes in 1f261c2

11 years agoFixed dummy warning.
LeonidBeynenson [Fri, 1 Feb 2013 12:16:43 +0000 (16:16 +0400)]
Fixed dummy warning.

11 years agoSmartek Giganetix Cameras support (Patch #2192) integrated.
Alexander Smorkalov [Fri, 1 Feb 2013 12:07:32 +0000 (16:07 +0400)]
Smartek Giganetix Cameras support (Patch #2192) integrated.

11 years agoMerge pull request #405 from vpisarev:znah_patch
Andrey Kamaev [Fri, 1 Feb 2013 12:06:54 +0000 (16:06 +0400)]
Merge pull request #405 from vpisarev:znah_patch

11 years agoChanged types of some variables from int64 back to int.
LeonidBeynenson [Fri, 1 Feb 2013 10:26:02 +0000 (14:26 +0400)]
Changed types of some variables from int64 back to int.
Also corrected some indexes to be size_t.

11 years agoa part of PR269 (parallelization of several functions) by Alexander Mordvintsev
Vadim Pisarevsky [Fri, 1 Feb 2013 10:01:44 +0000 (14:01 +0400)]
a part of PR269 (parallelization of several functions) by Alexander Mordvintsev

11 years agoMerge pull request #396 from vpisarev:facedetect_fixes
Andrey Kamaev [Fri, 1 Feb 2013 08:49:48 +0000 (12:49 +0400)]
Merge pull request #396 from vpisarev:facedetect_fixes

11 years agoMerge pull request #400 from ilysenkov:bugfix_2560
Andrey Kamaev [Fri, 1 Feb 2013 08:05:48 +0000 (12:05 +0400)]
Merge pull request #400 from ilysenkov:bugfix_2560

11 years agoMerge pull request #397 from ilysenkov:bugfix_2677
Andrey Kamaev [Fri, 1 Feb 2013 08:04:38 +0000 (12:04 +0400)]
Merge pull request #397 from ilysenkov:bugfix_2677

11 years agoMerge pull request #398 from ilysenkov:bugfix_2330
Andrey Kamaev [Fri, 1 Feb 2013 07:19:33 +0000 (11:19 +0400)]
Merge pull request #398 from ilysenkov:bugfix_2330

11 years agofixed compile warnings
Vadim Pisarevsky [Fri, 1 Feb 2013 06:47:27 +0000 (10:47 +0400)]
fixed compile warnings

11 years agoMerge pull request #392 from vpisarev:python_fixes2
Andrey Kamaev [Fri, 1 Feb 2013 06:20:51 +0000 (10:20 +0400)]
Merge pull request #392 from vpisarev:python_fixes2

11 years agoDocumented the TermCriteria class (#2560)
Ilya Lysenkov [Fri, 1 Feb 2013 06:16:30 +0000 (10:16 +0400)]
Documented the TermCriteria class (#2560)

11 years agoAdded info() method in descriptor matchers (#2330)
Ilya Lysenkov [Thu, 31 Jan 2013 21:07:27 +0000 (01:07 +0400)]
Added info() method in descriptor matchers (#2330)

11 years agoChecked key_size in LSH table for validness (#2677)
Ilya Lysenkov [Thu, 31 Jan 2013 19:19:19 +0000 (23:19 +0400)]
Checked key_size in LSH table for validness (#2677)

11 years agoAdded a test for invalid key sizes in LSH tables
Ilya Lysenkov [Thu, 31 Jan 2013 19:17:07 +0000 (23:17 +0400)]
Added a test for invalid key sizes in LSH tables

11 years agodisabled the use of SSE4 instructions as well to make the code compatible with the...
Vadim Pisarevsky [Thu, 31 Jan 2013 18:57:46 +0000 (22:57 +0400)]
disabled the use of SSE4 instructions as well to make the code compatible with the old Intel and AMD chips

11 years agoadded test for the old cvHaarDetectObjects. disabled AVX optimization in haar.cpp...
Vadim Pisarevsky [Thu, 31 Jan 2013 18:55:04 +0000 (22:55 +0400)]
added test for the old cvHaarDetectObjects. disabled AVX optimization in haar.cpp. it should cover tickets #2534, #2591, #2669

11 years agoMerge pull request #390 from taka-no-me:fix_relative_error_check
Andrey Kamaev [Thu, 31 Jan 2013 17:32:44 +0000 (21:32 +0400)]
Merge pull request #390 from taka-no-me:fix_relative_error_check

11 years agoMerge pull request #318 from AnnaKogan8:fixed-perf-tests
Andrey Kamaev [Thu, 31 Jan 2013 17:01:44 +0000 (21:01 +0400)]
Merge pull request #318 from AnnaKogan8:fixed-perf-tests

11 years agoMerge pull request #394 from taka-no-me:fix_tiff_test
Andrey Kamaev [Thu, 31 Jan 2013 16:52:35 +0000 (20:52 +0400)]
Merge pull request #394 from taka-no-me:fix_tiff_test

11 years agoMerge pull request #393 from Daniil-Osokin:bugfix_doc_multi_issues
Andrey Kamaev [Thu, 31 Jan 2013 16:30:32 +0000 (20:30 +0400)]
Merge pull request #393 from Daniil-Osokin:bugfix_doc_multi_issues

11 years agoyet another minor fix in cv::transpose()
Vadim Pisarevsky [Thu, 31 Jan 2013 16:26:16 +0000 (20:26 +0400)]
yet another minor fix in cv::transpose()

11 years agofixed failure of the C++ test for estimateAffine3D
Vadim Pisarevsky [Thu, 31 Jan 2013 15:44:16 +0000 (19:44 +0400)]
fixed failure of the C++ test for estimateAffine3D

11 years agoMade changes to allow ml module to work with big data.
LeonidBeynenson [Tue, 29 Jan 2013 17:11:52 +0000 (21:11 +0400)]
Made changes to allow ml module to work with big data.

11 years agoMerge pull request #391 from taka-no-me:fix_buildbot_issues
Andrey Kamaev [Thu, 31 Jan 2013 14:55:09 +0000 (18:55 +0400)]
Merge pull request #391 from taka-no-me:fix_buildbot_issues

11 years agoModify decode_tile16384x16384 test to not fail when available memory is not enough...
Andrey Kamaev [Thu, 31 Jan 2013 14:17:29 +0000 (18:17 +0400)]
Modify decode_tile16384x16384 test to not fail when available memory is not enough for test

11 years agoFixed multiple issues in docs (bug #2410)
Daniil Osokin [Thu, 31 Jan 2013 11:15:13 +0000 (15:15 +0400)]
Fixed multiple issues in docs (bug #2410)

11 years agoapplied patch #2587
Vadim Pisarevsky [Thu, 31 Jan 2013 12:19:20 +0000 (16:19 +0400)]
applied patch #2587

11 years agoIncreased time limits, eliminated extra params
Anna Kogan [Wed, 16 Jan 2013 07:57:24 +0000 (11:57 +0400)]
Increased time limits, eliminated extra params

11 years agoadded tests for fast (ticket #2613) and estimateAffine3D (#2375)
Vadim Pisarevsky [Thu, 31 Jan 2013 12:15:40 +0000 (16:15 +0400)]
added tests for fast (ticket #2613) and estimateAffine3D (#2375)

11 years agoTemporary disable unstable Features2d_RotationInvariance_Detector_SIFT test
Andrey Kamaev [Thu, 31 Jan 2013 12:06:22 +0000 (16:06 +0400)]
Temporary disable unstable Features2d_RotationInvariance_Detector_SIFT test

11 years agoSuppress clang build warning
Andrey Kamaev [Thu, 31 Jan 2013 12:00:48 +0000 (16:00 +0400)]
Suppress clang build warning

11 years agoCorrect tolerance value for sanity checks with ERROR_RELATIVE
Andrey Kamaev [Thu, 31 Jan 2013 11:21:14 +0000 (15:21 +0400)]
Correct tolerance value for sanity checks with ERROR_RELATIVE

Use min/max bounds instead of local value to calculate acceptance threshold.
Threshold based on local values somethimes does not work because cancellation
of big values may produce error bigger than local value.

11 years agofixed bugs #1718, #2375; attached the new tests to test.py.
Vadim Pisarevsky [Thu, 31 Jan 2013 11:34:09 +0000 (15:34 +0400)]
fixed bugs #1718, #2375; attached the new tests to test.py.

11 years agoMerge pull request #389 from Daniil-Osokin:bugfix_doc_opencv_with_cmake
Andrey Kamaev [Thu, 31 Jan 2013 11:04:56 +0000 (15:04 +0400)]
Merge pull request #389 from Daniil-Osokin:bugfix_doc_opencv_with_cmake

11 years agoMerge pull request #385 from etalanin:bug2607
cuda-geek [Thu, 31 Jan 2013 09:46:00 +0000 (13:46 +0400)]
Merge pull request #385 from etalanin:bug2607

11 years agoMerge pull request #381 from vpisarev:surf_fixes
cuda-geek [Thu, 31 Jan 2013 09:36:09 +0000 (13:36 +0400)]
Merge pull request #381 from vpisarev:surf_fixes

11 years agoFixed sample files in "Using OpenCV with gcc and CMake" tutorial (bug #2663, #2588)
Daniil Osokin [Thu, 31 Jan 2013 07:43:38 +0000 (11:43 +0400)]
Fixed sample files in "Using OpenCV with gcc and CMake" tutorial (bug #2663, #2588)

11 years agoMerge pull request #387 from taka-no-me:fix_dshow_fourcc_conversion
cuda-geek [Thu, 31 Jan 2013 09:26:25 +0000 (13:26 +0400)]
Merge pull request #387 from taka-no-me:fix_dshow_fourcc_conversion

11 years agoMerge pull request #382 from cuda-geek:fix-broken-links-bug-2689
Andrey Kamaev [Thu, 31 Jan 2013 09:08:01 +0000 (13:08 +0400)]
Merge pull request #382 from cuda-geek:fix-broken-links-bug-2689

11 years agoFix and test for #2607
Evgeny Talanin [Wed, 30 Jan 2013 17:39:26 +0000 (21:39 +0400)]
Fix and test for #2607

11 years agoMerge pull request #383 from cuda-geek:apply-opencv-macosx-patch
cuda-geek [Thu, 31 Jan 2013 08:04:13 +0000 (12:04 +0400)]
Merge pull request #383 from cuda-geek:apply-opencv-macosx-patch

11 years agoFix truncation of fourcc value in dshow capture property setter (bug #2535)
Andrey Kamaev [Wed, 30 Jan 2013 22:12:54 +0000 (02:12 +0400)]
Fix truncation of fourcc value in dshow capture property setter (bug #2535)

Added test checking that all valid fourcc values are converted properly

11 years agoMerge pull request #374 from ivan-korolev:fix_estimateRigidTransform
Andrey Kamaev [Wed, 30 Jan 2013 16:26:54 +0000 (20:26 +0400)]
Merge pull request #374 from ivan-korolev:fix_estimateRigidTransform

11 years agoapply patch #2686
marina.kolpakova [Wed, 30 Jan 2013 16:20:06 +0000 (20:20 +0400)]
apply patch #2686

11 years agoMerge pull request #375 from taka-no-me:fix_opticalflow_2075
cuda-geek [Wed, 30 Jan 2013 16:18:53 +0000 (20:18 +0400)]
Merge pull request #375 from taka-no-me:fix_opticalflow_2075

11 years agoMerge pull request #373 from ilysenkov:bugfix_2440
Andrey Kamaev [Wed, 30 Jan 2013 15:37:16 +0000 (19:37 +0400)]
Merge pull request #373 from ilysenkov:bugfix_2440

11 years agoMerge pull request #376 from taka-no-me:solve_tiff_conflict
Andrey Kamaev [Wed, 30 Jan 2013 15:36:09 +0000 (19:36 +0400)]
Merge pull request #376 from taka-no-me:solve_tiff_conflict

11 years agofix broken links in cascade classification documentation
marina.kolpakova [Wed, 30 Jan 2013 15:28:16 +0000 (19:28 +0400)]
fix broken links in cascade classification documentation

11 years agoMerge pull request #378 from ivan-korolev:fix_OpenCVDetectTBB_cmake
Andrey Kamaev [Wed, 30 Jan 2013 15:16:31 +0000 (19:16 +0400)]
Merge pull request #378 from ivan-korolev:fix_OpenCVDetectTBB_cmake

11 years agoMerge pull request #380 from asmorkalov:java_test_fix2
cuda-geek [Wed, 30 Jan 2013 15:03:35 +0000 (19:03 +0400)]
Merge pull request #380 from asmorkalov:java_test_fix2

11 years agoMerge pull request #377 from ivan-korolev:fix_v4l_yes-yes_build
cuda-geek [Wed, 30 Jan 2013 14:59:55 +0000 (18:59 +0400)]
Merge pull request #377 from ivan-korolev:fix_v4l_yes-yes_build

11 years agochanged default parameters of SURF, which improved its performance. Restored bi-linea...
Vadim Pisarevsky [Wed, 30 Jan 2013 14:07:37 +0000 (18:07 +0400)]
changed default parameters of SURF, which improved its performance. Restored bi-linear interpolation in SURF descriptor extractor. Added test for SURF homography + check for non-zero (positive) responses.

11 years agoMerge pull request #379 from taka-no-me:fix_ocl_samples_warnings
Andrey Kamaev [Wed, 30 Jan 2013 14:06:49 +0000 (18:06 +0400)]
Merge pull request #379 from taka-no-me:fix_ocl_samples_warnings

11 years agoTestCheckVector java test fixed. Warning fixed.
Alexander Smorkalov [Wed, 30 Jan 2013 13:28:22 +0000 (17:28 +0400)]
TestCheckVector java test fixed. Warning fixed.

11 years agoFix build warnings in OpenCL samples
Andrey Kamaev [Wed, 30 Jan 2013 13:25:03 +0000 (17:25 +0400)]
Fix build warnings in OpenCL samples

11 years agofix default include dirs for TBB
Ivan Korolev [Wed, 30 Jan 2013 13:17:04 +0000 (17:17 +0400)]
fix default include dirs for TBB

11 years agofix v4l yes-yes build
Ivan Korolev [Wed, 30 Jan 2013 13:04:33 +0000 (17:04 +0400)]
fix v4l yes-yes build

11 years agoSolve conflict between tiff.h and opencv2/core/types_c.h
Andrey Kamaev [Wed, 30 Jan 2013 12:36:50 +0000 (16:36 +0400)]
Solve conflict between tiff.h and opencv2/core/types_c.h

Сonflict exists between some versions of libtiff and opencv headers

11 years agoAllow input of calcOpticalFlowPyrLK be submats of different size images
Andrey Kamaev [Wed, 30 Jan 2013 12:07:55 +0000 (16:07 +0400)]
Allow input of calcOpticalFlowPyrLK be submats of different size images

This fixes bug #2075

11 years agoAdd test for issue #2075
Andrey Kamaev [Wed, 30 Jan 2013 12:07:38 +0000 (16:07 +0400)]
Add test for issue #2075

11 years agoFixed bug in the cv::estimateRigidTransform (#1949)
Ivan Korolev [Wed, 30 Jan 2013 09:10:50 +0000 (13:10 +0400)]
Fixed bug in the cv::estimateRigidTransform (#1949)

11 years agoFixed cvDestroyAllWindows() without windows in QT (#2440)
Ilya Lysenkov [Wed, 30 Jan 2013 11:26:49 +0000 (15:26 +0400)]
Fixed cvDestroyAllWindows() without windows in QT (#2440)

11 years agoTested cvDestroyAllWindows() without windows
Ilya Lysenkov [Wed, 30 Jan 2013 11:25:10 +0000 (15:25 +0400)]
Tested cvDestroyAllWindows() without windows

11 years agoMerge pull request #365 from ivan-korolev:fix_HoughLines_segfault
Andrey Kamaev [Wed, 30 Jan 2013 11:16:30 +0000 (15:16 +0400)]
Merge pull request #365 from ivan-korolev:fix_HoughLines_segfault

11 years agoMerge pull request #371 from taka-no-me:fix_build
Andrey Kamaev [Wed, 30 Jan 2013 11:06:19 +0000 (15:06 +0400)]
Merge pull request #371 from taka-no-me:fix_build

11 years agoMerge pull request #370 from ilysenkov:bugfix_1747
Andrey Kamaev [Wed, 30 Jan 2013 10:42:10 +0000 (14:42 +0400)]
Merge pull request #370 from ilysenkov:bugfix_1747