platform/upstream/opencv.git
11 years agoMerge pull request #267 from pclove1:ocl_hough
Andrey Kamaev [Sat, 19 Jan 2013 08:02:14 +0000 (12:02 +0400)]
Merge pull request #267 from pclove1:ocl_hough

11 years agoMerge branch 2.4
Andrey Kamaev [Thu, 17 Jan 2013 14:36:57 +0000 (18:36 +0400)]
Merge branch 2.4

11 years agoMerge pull request #304 from apavlenko:test_java_fix_double
Andrey Kamaev [Thu, 17 Jan 2013 14:20:47 +0000 (18:20 +0400)]
Merge pull request #304 from apavlenko:test_java_fix_double

11 years agofixing test failure on some systems
Andrey Pavlenko [Wed, 16 Jan 2013 14:33:35 +0000 (18:33 +0400)]
fixing test failure on some systems

11 years agoMerge pull request #289 from jmbuena:master
Andrey Kamaev [Wed, 16 Jan 2013 13:01:00 +0000 (17:01 +0400)]
Merge pull request #289 from jmbuena:master

11 years agoMerge pull request #296 from asmorkalov:html_docs_warning_fix
Andrey Kamaev [Wed, 16 Jan 2013 12:44:12 +0000 (16:44 +0400)]
Merge pull request #296 from asmorkalov:html_docs_warning_fix

11 years agoMerge pull request #297 from taka-no-me:fix_deps
Andrey Kamaev [Wed, 16 Jan 2013 12:30:37 +0000 (16:30 +0400)]
Merge pull request #297 from taka-no-me:fix_deps

11 years agoMerge pull request #293 from taka-no-me:libjpeg9
Andrey Kamaev [Wed, 16 Jan 2013 12:08:06 +0000 (16:08 +0400)]
Merge pull request #293 from taka-no-me:libjpeg9

11 years agoMerge pull request #302 from taka-no-me:fix_doc_sphinx107
Andrey Kamaev [Wed, 16 Jan 2013 12:07:49 +0000 (16:07 +0400)]
Merge pull request #302 from taka-no-me:fix_doc_sphinx107

11 years agoMerge pull request #300 from taka-no-me:java_64bit
Andrey Kamaev [Wed, 16 Jan 2013 10:49:46 +0000 (14:49 +0400)]
Merge pull request #300 from taka-no-me:java_64bit

11 years agoFix documentation build with Sphinx 1.07
Andrey Kamaev [Wed, 16 Jan 2013 08:43:12 +0000 (12:43 +0400)]
Fix documentation build with Sphinx 1.07

11 years agoMerge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
Suenghoon Park [Tue, 15 Jan 2013 17:21:25 +0000 (12:21 -0500)]
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough

11 years agoFix incorrect Mat address reconstruction on 64-bit platforms
Andrey Kamaev [Tue, 15 Jan 2013 15:23:49 +0000 (19:23 +0400)]
Fix incorrect Mat address reconstruction on 64-bit platforms

This fixes random failures in Java wrappers.

11 years agoFix dependencies inference for auto-disabled targets
Andrey Kamaev [Mon, 14 Jan 2013 14:16:04 +0000 (18:16 +0400)]
Fix dependencies inference for auto-disabled targets

Sometimes information about dependencies causing disabling were loosed and it
was not possible to correctly display these dependencies in status report

11 years agoDocumentation build warning fixes.
Alexander Smorkalov [Sun, 13 Jan 2013 12:27:11 +0000 (16:27 +0400)]
Documentation build warning fixes.

Invalid links and refences fixed.
SpaeseMat class documentation updated.

11 years agoUpdate libjpeg to "Version 9 13-Jan-2013"
Andrey Kamaev [Sun, 30 Dec 2012 23:12:28 +0000 (03:12 +0400)]
Update libjpeg to "Version 9  13-Jan-2013"

11 years agoMerge pull request #240 from emchristiansen:javatest2.4
Andrey Kamaev [Mon, 14 Jan 2013 07:06:43 +0000 (11:06 +0400)]
Merge pull request #240 from emchristiansen:javatest2.4

11 years agoFixed compile warnings on CvHomographyEstimator
jmbuena [Sat, 12 Jan 2013 11:32:51 +0000 (12:32 +0100)]
Fixed compile warnings on CvHomographyEstimator

11 years agoMerge branch 2.4
Andrey Kamaev [Fri, 11 Jan 2013 11:43:50 +0000 (15:43 +0400)]
Merge branch 2.4

11 years agomore tests fixes
Andrey Pavlenko [Fri, 11 Jan 2013 05:13:25 +0000 (09:13 +0400)]
more tests fixes

11 years agoChanged RANSAC Homography estimation for speed. Each minimal set is checked for consi...
jmbuena [Fri, 11 Jan 2013 00:55:56 +0000 (01:55 +0100)]
Changed RANSAC Homography estimation for speed. Each minimal set is checked for consistency before actually fit a candidate homography.

11 years agoMerge pull request #253 from Nerei:smart_operators_for_smart_ptr
Vadim Pisarevsky [Thu, 10 Jan 2013 16:35:22 +0000 (20:35 +0400)]
Merge pull request #253 from Nerei:smart_operators_for_smart_ptr

11 years agoMerge pull request #286 from taka-no-me:tweak_phase_test_threshold
Andrey Kamaev [Thu, 10 Jan 2013 15:57:23 +0000 (19:57 +0400)]
Merge pull request #286 from taka-no-me:tweak_phase_test_threshold

11 years agoMerge pull request #287 from taka-no-me:fix_cvCalcOpticalFlow_2526
Andrey Kamaev [Thu, 10 Jan 2013 15:56:43 +0000 (19:56 +0400)]
Merge pull request #287 from taka-no-me:fix_cvCalcOpticalFlow_2526

11 years agoMerge pull request #288 from taka-no-me:fix_unused_cmake_variable
Andrey Kamaev [Thu, 10 Jan 2013 15:56:26 +0000 (19:56 +0400)]
Merge pull request #288 from taka-no-me:fix_unused_cmake_variable

11 years agoAlways touch variable controlling build of the module
Andrey Kamaev [Thu, 10 Jan 2013 15:05:39 +0000 (19:05 +0400)]
Always touch variable controlling build of the module

This suppresses "unused variable" CMake warning when user explicilty disables
module unavailable in selected configuration

11 years agoFix cvCalcOpticalFlow when the status parameter is NULL
Andrey Kamaev [Thu, 10 Jan 2013 14:14:08 +0000 (18:14 +0400)]
Fix cvCalcOpticalFlow when the status parameter is NULL

issue 2526

11 years agoWeaken acceptance criteria in phase test
Andrey Kamaev [Thu, 10 Jan 2013 13:12:14 +0000 (17:12 +0400)]
Weaken acceptance criteria in phase test

11 years agoMerge pull request #284 from taka-no-me:fix_equalize_hist_2678
Andrey Kamaev [Thu, 10 Jan 2013 12:58:36 +0000 (16:58 +0400)]
Merge pull request #284 from taka-no-me:fix_equalize_hist_2678

11 years agoMerge pull request #283 from AnnaKogan8:perf_tests_timing.py-improved-console-output
Andrey Kamaev [Thu, 10 Jan 2013 12:58:21 +0000 (16:58 +0400)]
Merge pull request #283 from AnnaKogan8:perf_tests_timing.py-improved-console-output

11 years agoMerge pull request #135 from nevion:master
Vadim Pisarevsky [Thu, 10 Jan 2013 12:43:44 +0000 (16:43 +0400)]
Merge pull request #135 from nevion:master

11 years agoFix histogram calculation in equalizeHist
Andrey Kamaev [Thu, 10 Jan 2013 10:45:00 +0000 (14:45 +0400)]
Fix histogram calculation in equalizeHist

issue #2678

11 years agoMerge pull request #280 from vpisarev:bug_fixes_jan9
Andrey Kamaev [Thu, 10 Jan 2013 09:31:04 +0000 (13:31 +0400)]
Merge pull request #280 from vpisarev:bug_fixes_jan9

11 years agoImproved console output
Anna Kogan [Thu, 10 Jan 2013 09:19:59 +0000 (13:19 +0400)]
Improved console output

11 years agoCleaned code
Anna Kogan [Thu, 10 Jan 2013 09:18:26 +0000 (13:18 +0400)]
Cleaned code

11 years agoFixed last testsuit disregarding
Anna Kogan [Thu, 10 Jan 2013 09:16:46 +0000 (13:16 +0400)]
Fixed last testsuit disregarding

11 years agofixed bug #2679
Vadim Pisarevsky [Wed, 9 Jan 2013 13:53:19 +0000 (17:53 +0400)]
fixed bug #2679

11 years agoMerge pull request #272 from 5kg:fix_haar
Andrey Kamaev [Wed, 9 Jan 2013 12:53:11 +0000 (16:53 +0400)]
Merge pull request #272 from 5kg:fix_haar

11 years agoMerge pull request #278 from taka-no-me:fix_build_jpeg9
Andrey Kamaev [Wed, 9 Jan 2013 12:52:56 +0000 (16:52 +0400)]
Merge pull request #278 from taka-no-me:fix_build_jpeg9

11 years agoMerge pull request #279 from taka-no-me:mingw_java
Andrey Kamaev [Wed, 9 Jan 2013 12:52:40 +0000 (16:52 +0400)]
Merge pull request #279 from taka-no-me:mingw_java

11 years agoMerge pull request #265 from taka-no-me:doc_signatures
Vadim Pisarevsky [Wed, 9 Jan 2013 11:40:38 +0000 (15:40 +0400)]
Merge pull request #265 from taka-no-me:doc_signatures

11 years agoFix build with libjpeg release 9
Andrey Kamaev [Mon, 31 Dec 2012 00:17:36 +0000 (04:17 +0400)]
Fix build with libjpeg release 9

11 years agoSmart operators for smart Ptr (feature #2637)
Anatoly Baksheev [Fri, 21 Dec 2012 19:27:29 +0000 (23:27 +0400)]
Smart operators for smart Ptr (feature #2637)

11 years agoMerge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
Suenghoon Park [Wed, 2 Jan 2013 19:59:59 +0000 (14:59 -0500)]
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough

11 years agoMerge pull request #277 from ilya-lavrenov:ResizeAreaFast
Andrey Kamaev [Tue, 1 Jan 2013 17:34:17 +0000 (21:34 +0400)]
Merge pull request #277 from ilya-lavrenov:ResizeAreaFast

11 years agofixed bug connected with SSE2 version of resize with AREA interpolation
Ilya Lavrenov [Mon, 31 Dec 2012 11:35:40 +0000 (15:35 +0400)]
fixed bug connected with SSE2 version of resize with AREA interpolation

11 years agoFix build of java bindings on mingw
Andrey Kamaev [Sun, 30 Dec 2012 19:24:39 +0000 (23:24 +0400)]
Fix build of java bindings on mingw

11 years agoMerge pull request #276 from cuda-geek:fix-precomps
cuda-geek [Sun, 30 Dec 2012 13:27:54 +0000 (17:27 +0400)]
Merge pull request #276 from cuda-geek:fix-precomps

11 years agofix precompiled headers usage in gpu module
marina.kolpakova [Sun, 30 Dec 2012 12:58:41 +0000 (16:58 +0400)]
fix precompiled headers usage in gpu module

11 years agoMerge pull request #275 from mdim:bug_fix_cvboost
cuda-geek [Sat, 29 Dec 2012 20:31:03 +0000 (00:31 +0400)]
Merge pull request #275 from mdim:bug_fix_cvboost

11 years agodecreased source size in NCV.VectorOperations test
Vladislav Vinogradov [Sat, 29 Dec 2012 10:55:29 +0000 (14:55 +0400)]
decreased source size in NCV.VectorOperations test

11 years agomerge CUDA dev branch
marina.kolpakova [Sat, 29 Dec 2012 15:44:38 +0000 (19:44 +0400)]
merge CUDA dev branch

11 years agoMerge pull request #270 from wswld:2.4
Andrey Kamaev [Sat, 29 Dec 2012 12:47:39 +0000 (16:47 +0400)]
Merge pull request #270 from wswld:2.4

11 years agoMerge pull request #271 from 5kg:fix_cascade
Andrey Kamaev [Sat, 29 Dec 2012 11:04:10 +0000 (15:04 +0400)]
Merge pull request #271 from 5kg:fix_cascade

11 years agoMerge pull request #273 from saskathex:master
Andrey Kamaev [Sat, 29 Dec 2012 11:03:50 +0000 (15:03 +0400)]
Merge pull request #273 from saskathex:master

11 years agomodified performance test for ocl::HoughCircles
Suenghoon Park [Fri, 28 Dec 2012 21:32:10 +0000 (16:32 -0500)]
modified performance test for ocl::HoughCircles

11 years agofixed CvBoost::predict
Maria Dimashova [Fri, 28 Dec 2012 20:30:52 +0000 (00:30 +0400)]
fixed CvBoost::predict
(Sometimes sample_data became bad because the buffer with its values was deallocated early).

11 years agoFixed misspelled words.
saskathex [Fri, 28 Dec 2012 18:29:15 +0000 (19:29 +0100)]
Fixed misspelled words.

11 years agoremoved personal info from the license header
Suenghoon Park [Fri, 28 Dec 2012 15:08:28 +0000 (10:08 -0500)]
removed personal info from the license header

11 years agoChanged parallel_for to parallel_for_ in haar.cpp
Zifei Tong [Fri, 28 Dec 2012 06:44:06 +0000 (14:44 +0800)]
Changed parallel_for to parallel_for_ in haar.cpp

11 years agopartial fix for failing tests; fix for Windows launcher script; more quiet output
Andrey Pavlenko [Fri, 28 Dec 2012 13:03:35 +0000 (17:03 +0400)]
partial fix for failing tests; fix for Windows launcher script; more quiet output

11 years agoFix race condition for Cascade Classifier when TBB enabled.
Zifei Tong [Thu, 27 Dec 2012 07:43:16 +0000 (15:43 +0800)]
Fix race condition for Cascade Classifier when TBB enabled.

11 years agoFixed a bunch of minor issues in 'dev_with_OCV_on_Android.rst'.
Vsevolod Glumov [Fri, 28 Dec 2012 11:03:20 +0000 (15:03 +0400)]
Fixed a bunch of minor issues in 'dev_with_OCV_on_Android.rst'.

11 years agoMerge pull request #266 from prclibo:master
Andrey Kamaev [Fri, 28 Dec 2012 08:51:34 +0000 (12:51 +0400)]
Merge pull request #266 from prclibo:master

11 years agoMerge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
Suenghoon Park [Wed, 26 Dec 2012 22:40:38 +0000 (17:40 -0500)]
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough

11 years agoadded documentation for ocl::HoughCircles
Suenghoon Park [Wed, 26 Dec 2012 22:40:26 +0000 (17:40 -0500)]
added documentation for ocl::HoughCircles

11 years agoadded performance test
Suenghoon Park [Wed, 26 Dec 2012 21:49:58 +0000 (16:49 -0500)]
added performance test

11 years agoadded code, test and doc for five-point algorithm
Bo Li [Wed, 26 Dec 2012 17:58:50 +0000 (18:58 +0100)]
added code, test and doc for five-point algorithm

11 years agofixed CC for CAMRA
Anatoly Baksheev [Wed, 26 Dec 2012 17:47:06 +0000 (21:47 +0400)]
fixed CC for CAMRA

11 years agoFix discrepancies between function signatures in headers and documentation
Andrey Kamaev [Wed, 26 Dec 2012 13:51:04 +0000 (17:51 +0400)]
Fix discrepancies between function signatures in headers and documentation

11 years agoImprove function arguments parsing and checking
Andrey Kamaev [Mon, 12 Nov 2012 10:42:28 +0000 (14:42 +0400)]
Improve function arguments parsing and checking

* always use "argN" names for unnamed arguments
* honor space symbol between typename and "*", "&" symbols
* fix indent errors

11 years agoMerge pull request #264 from kirill-kornyakov:remove-hack-from-hough-lines-perf-test
Andrey Kamaev [Wed, 26 Dec 2012 08:53:50 +0000 (12:53 +0400)]
Merge pull request #264 from kirill-kornyakov:remove-hack-from-hough-lines-perf-test

11 years agoRemoved hack from perf test on HoughLines, since I hope it is fixed by pr263
Kirill Kornyakov [Wed, 26 Dec 2012 06:33:02 +0000 (10:33 +0400)]
Removed hack from perf test on HoughLines, since I hope it is fixed by pr263

11 years agowarnings, renamed Marina's GPU_PERF_TEST_P
Anatoly Baksheev [Tue, 25 Dec 2012 17:57:10 +0000 (21:57 +0400)]
warnings, renamed Marina's GPU_PERF_TEST_P

11 years agoadded GPU_PERF_TESTP_P but haven't switched test to it (only perf4au app)
Anatoly Baksheev [Tue, 25 Dec 2012 15:53:58 +0000 (19:53 +0400)]
added GPU_PERF_TESTP_P but haven't switched test to it (only perf4au app)

11 years agoMerge release 2.4.3.2
Andrey Kamaev [Tue, 25 Dec 2012 15:07:08 +0000 (19:07 +0400)]
Merge release 2.4.3.2

11 years agoMerge pull request #263 from taka-no-me:hough_explicit_double
Andrey Kamaev [Tue, 25 Dec 2012 14:54:54 +0000 (18:54 +0400)]
Merge pull request #263 from taka-no-me:hough_explicit_double

11 years agoMerge pull request #261 from apavlenko:samples_remove_empty_menu
Andrey Kamaev [Tue, 25 Dec 2012 14:28:05 +0000 (18:28 +0400)]
Merge pull request #261 from apavlenko:samples_remove_empty_menu

11 years agoMerge pull request #262 from kirill-kornyakov:minor-cleanings-for-android-sdk
Andrey Kamaev [Tue, 25 Dec 2012 14:26:17 +0000 (18:26 +0400)]
Merge pull request #262 from kirill-kornyakov:minor-cleanings-for-android-sdk

11 years agoExplicitly use double precision sin & cos in hough implementation
Andrey Kamaev [Tue, 25 Dec 2012 14:05:05 +0000 (18:05 +0400)]
Explicitly use double precision sin & cos in hough implementation

On some platforms sin and cos are calculated in single precision resulting in
diversity of results.

11 years agoUpdated OpenCV Manager rst documentation
Kirill Kornyakov [Tue, 25 Dec 2012 13:50:31 +0000 (17:50 +0400)]
Updated OpenCV Manager rst documentation

11 years agohiding empty menu button on Android 4
Andrey Pavlenko [Tue, 25 Dec 2012 13:49:10 +0000 (17:49 +0400)]
hiding empty menu button on Android 4

11 years agoUpdated readme.txt with desciption about different OCV Manager packages
Kirill Kornyakov [Tue, 25 Dec 2012 13:16:30 +0000 (17:16 +0400)]
Updated readme.txt with desciption about different OCV Manager packages

11 years agoadded unit test for HoughCircles
Suenghoon Park [Tue, 25 Dec 2012 03:53:27 +0000 (22:53 -0500)]
added unit test for HoughCircles

11 years agoMerge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
Suenghoon Park [Mon, 24 Dec 2012 23:42:22 +0000 (18:42 -0500)]
Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough

11 years agofixed a typo in ocl.hpp
Suenghoon Park [Mon, 24 Dec 2012 23:41:51 +0000 (18:41 -0500)]
fixed a typo in ocl.hpp

11 years agoMerge pull request #247 from wswld:2.4
Andrey Kamaev [Mon, 24 Dec 2012 17:02:04 +0000 (21:02 +0400)]
Merge pull request #247 from wswld:2.4

11 years agoupdating tutorial #2
Andrey Pavlenko [Mon, 24 Dec 2012 16:05:27 +0000 (20:05 +0400)]
updating tutorial #2

11 years agoMerge pull request #257 from AnnaKogan8:perf-tests-timing-script
Andrey Kamaev [Mon, 24 Dec 2012 15:38:48 +0000 (19:38 +0400)]
Merge pull request #257 from AnnaKogan8:perf-tests-timing-script

11 years agoMerge pull request #259 from asmorkalov:manager_outofbound_fix
Andrey Kamaev [Mon, 24 Dec 2012 15:32:51 +0000 (19:32 +0400)]
Merge pull request #259 from asmorkalov:manager_outofbound_fix

11 years agoMerge ppull request #258 from asmorkalov/android_emu_fix
Andrey Kamaev [Mon, 24 Dec 2012 15:25:57 +0000 (19:25 +0400)]
Merge ppull request #258 from asmorkalov/android_emu_fix

11 years agoMerge pull request #260 from alekcac:css_fix
Andrey Kamaev [Mon, 24 Dec 2012 15:26:14 +0000 (19:26 +0400)]
Merge pull request #260 from alekcac:css_fix

11 years agoupdating tutorial #1
Andrey Pavlenko [Mon, 24 Dec 2012 15:25:42 +0000 (19:25 +0400)]
updating tutorial #1

11 years agomodify default css for search button (error #2654)
Alexander Shishkov [Mon, 24 Dec 2012 14:26:02 +0000 (18:26 +0400)]
modify default css for search button (error #2654)

11 years agoOpenCV Manager crashes with exception (Bug #2660)
Alexander Smorkalov [Mon, 24 Dec 2012 14:05:48 +0000 (18:05 +0400)]
OpenCV Manager crashes with exception (Bug #2660)

String checking and range cheching added.

11 years agoOpenCV example-tutorial1 does not work on Android emulator (Bug #2656)
Alexander Smorkalov [Mon, 24 Dec 2012 13:49:49 +0000 (17:49 +0400)]
OpenCV example-tutorial1 does not work on Android emulator (Bug #2656)

Problems with Android 2.3.3 (API level 10) fixed;
Android 2.2 does not work due to unsupported camera frame format (known android-2.2 emulator issue).

11 years agoMerge branch 2.4
Andrey Kamaev [Mon, 24 Dec 2012 13:10:07 +0000 (17:10 +0400)]
Merge branch 2.4

11 years agoImproved code
Anna Kogan [Mon, 24 Dec 2012 12:47:30 +0000 (16:47 +0400)]
Improved code

11 years agoWrote script generating timing table
Anna Kogan [Mon, 24 Dec 2012 11:29:49 +0000 (15:29 +0400)]
Wrote script generating timing table

11 years agoMerge pull request #256 from znah:2.4
Andrey Kamaev [Mon, 24 Dec 2012 12:11:19 +0000 (16:11 +0400)]
Merge pull request #256 from znah:2.4