platform/upstream/opencv.git
11 years agominor formatting
Andrey Pavlenko [Wed, 6 Mar 2013 08:59:38 +0000 (12:59 +0400)]
minor formatting

11 years agomore formatting
Andrey Pavlenko [Tue, 5 Mar 2013 15:03:36 +0000 (19:03 +0400)]
more formatting

11 years agoupdating JNI lib location for Unix; formatting update
Andrey Pavlenko [Tue, 5 Mar 2013 14:42:14 +0000 (18:42 +0400)]
updating JNI lib location for Unix; formatting update

11 years agomoving JNI library to 'build/lib' dir on non-Win
Andrey Pavlenko [Tue, 5 Mar 2013 14:41:44 +0000 (18:41 +0400)]
moving JNI library to 'build/lib' dir on non-Win

11 years agoDisable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown
Andrey Kamaev [Fri, 1 Mar 2013 15:44:17 +0000 (19:44 +0400)]
Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown

11 years agoMerge pull request #603 from taka-no-me:avoid_deps_on_missing_lib
Andrey Kamaev [Fri, 1 Mar 2013 13:10:45 +0000 (17:10 +0400)]
Merge pull request #603 from taka-no-me:avoid_deps_on_missing_lib

11 years agoMerge pull request #602 from bitwangyaoyao:2.4_fixAdd
Andrey Kamaev [Fri, 1 Mar 2013 13:10:11 +0000 (17:10 +0400)]
Merge pull request #602 from bitwangyaoyao:2.4_fixAdd

11 years agoMerge pull request #600 from taka-no-me:fix_build_warnings
Andrey Kamaev [Fri, 1 Mar 2013 13:09:56 +0000 (17:09 +0400)]
Merge pull request #600 from taka-no-me:fix_build_warnings

11 years agoAvoid build falure in armeabi build with Android SDK
Andrey Kamaev [Fri, 1 Mar 2013 12:50:42 +0000 (16:50 +0400)]
Avoid build falure in armeabi build with Android SDK

11 years agoMerge pull request #601 from apavlenko:android_tutorial_update
cuda-geek [Fri, 1 Mar 2013 12:09:25 +0000 (16:09 +0400)]
Merge pull request #601 from apavlenko:android_tutorial_update

11 years agoFix a bug in addWeighted x64 mode
yao [Fri, 1 Mar 2013 10:08:53 +0000 (18:08 +0800)]
Fix a bug in addWeighted x64 mode
And a potential problem in remap

11 years agoremoving redundant picture resize
Andrey Pavlenko [Fri, 1 Mar 2013 09:56:50 +0000 (13:56 +0400)]
removing redundant picture resize

11 years agoMerge pull request #598 from asmorkalov:lib_info_fix
Andrey Kamaev [Fri, 1 Mar 2013 09:52:57 +0000 (13:52 +0400)]
Merge pull request #598 from asmorkalov:lib_info_fix

11 years agominor Android tutorial fixes
Andrey Pavlenko [Fri, 1 Mar 2013 09:52:14 +0000 (13:52 +0400)]
minor Android tutorial fixes

11 years agoFix build warnings on MSVC x64 and OS X clang
Andrey Kamaev [Fri, 1 Mar 2013 08:17:05 +0000 (12:17 +0400)]
Fix build warnings on MSVC x64 and OS X clang

11 years agoMerge pull request #595 from bitwangyaoyao:2.4_perfTest
Andrey Kamaev [Fri, 1 Mar 2013 08:49:43 +0000 (12:49 +0400)]
Merge pull request #595 from bitwangyaoyao:2.4_perfTest

11 years agoMerge pull request #594 from asmorkalov:android_all_build_fix
Andrey Kamaev [Fri, 1 Mar 2013 08:49:27 +0000 (12:49 +0400)]
Merge pull request #594 from asmorkalov:android_all_build_fix

11 years agoMerge pull request #593 from apavlenko:java_tutorial_fixes
Andrey Kamaev [Fri, 1 Mar 2013 08:49:15 +0000 (12:49 +0400)]
Merge pull request #593 from apavlenko:java_tutorial_fixes

11 years agoFull package version fixed.
Alexander Smorkalov [Fri, 1 Mar 2013 08:44:14 +0000 (12:44 +0400)]
Full package version fixed.

11 years agoMerge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
Vadim Pisarevsky [Fri, 1 Mar 2013 06:55:11 +0000 (10:55 +0400)]
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher

11 years agofix a compile warning
yao [Fri, 1 Mar 2013 02:06:51 +0000 (10:06 +0800)]
fix a compile warning

11 years agofix compile warnings
yao [Fri, 1 Mar 2013 00:47:20 +0000 (08:47 +0800)]
fix compile warnings

11 years agoBuild with OpenCV.mk for all terget fixed.
Alexander [Thu, 28 Feb 2013 17:43:57 +0000 (21:43 +0400)]
Build with OpenCV.mk for all terget fixed.

11 years agofixing issues from http://www.code.opencv.org/issues/2807
Andrey Pavlenko [Thu, 28 Feb 2013 14:12:36 +0000 (18:12 +0400)]
fixing issues from www.code.opencv.org/issues/2807

11 years agoMerge pull request #591 from jet47:gpu-sanity-tests
Andrey Kamaev [Thu, 28 Feb 2013 14:08:11 +0000 (18:08 +0400)]
Merge pull request #591 from jet47:gpu-sanity-tests

11 years agoMerge pull request #590 from apavlenko:java_fixes
Andrey Kamaev [Thu, 28 Feb 2013 14:06:57 +0000 (18:06 +0400)]
Merge pull request #590 from apavlenko:java_fixes

11 years agoMerge pull request #589 from taka-no-me:2digit_pyversion
Andrey Kamaev [Thu, 28 Feb 2013 14:06:43 +0000 (18:06 +0400)]
Merge pull request #589 from taka-no-me:2digit_pyversion

11 years agoMerge pull request #587 from bitwangyaoyao:2.4_fixHog
Andrey Kamaev [Thu, 28 Feb 2013 14:06:27 +0000 (18:06 +0400)]
Merge pull request #587 from bitwangyaoyao:2.4_fixHog

11 years agoMerge pull request #585 from bitwangyaoyao:2.4_SURF
Andrey Kamaev [Thu, 28 Feb 2013 14:06:13 +0000 (18:06 +0400)]
Merge pull request #585 from bitwangyaoyao:2.4_SURF

11 years agoMerge pull request #525 from odeniz:2.4
Andrey Kamaev [Thu, 28 Feb 2013 14:05:55 +0000 (18:05 +0400)]
Merge pull request #525 from odeniz:2.4

11 years agopatch -> revision
Andrey Pavlenko [Thu, 28 Feb 2013 13:19:52 +0000 (17:19 +0400)]
patch -> revision

11 years agoadding more version-related variables
Andrey Pavlenko [Thu, 28 Feb 2013 12:56:53 +0000 (16:56 +0400)]
adding more version-related variables

11 years agofixed gpu sanity tests
Vladislav Vinogradov [Thu, 28 Feb 2013 12:43:08 +0000 (16:43 +0400)]
fixed gpu sanity tests

11 years agoHonor 2-digit python version
Andrey Kamaev [Thu, 28 Feb 2013 12:32:13 +0000 (16:32 +0400)]
Honor 2-digit python version

11 years agoupdating samples to load JNI lib with correct suffix
Andrey Pavlenko [Thu, 28 Feb 2013 12:24:52 +0000 (16:24 +0400)]
updating samples to load JNI lib with correct suffix

11 years agoadding/fixing version suffix for desktop java library on all OSes
Andrey Pavlenko [Mon, 18 Feb 2013 07:23:44 +0000 (11:23 +0400)]
adding/fixing version suffix for desktop java library on all OSes

11 years agoMerge pull request #570 from taka-no-me:fix_android_cmakeconfig
Andrey Kamaev [Thu, 28 Feb 2013 11:45:44 +0000 (15:45 +0400)]
Merge pull request #570 from taka-no-me:fix_android_cmakeconfig

11 years agoMerge pull request #572 from asmorkalov:manager_4_digit_version
Andrey Kamaev [Thu, 28 Feb 2013 11:44:57 +0000 (15:44 +0400)]
Merge pull request #572 from asmorkalov:manager_4_digit_version

11 years agoMerge pull request #584 from bitwangyaoyao:2.4_perfTest
Andrey Kamaev [Thu, 28 Feb 2013 11:44:06 +0000 (15:44 +0400)]
Merge pull request #584 from bitwangyaoyao:2.4_perfTest

11 years agoMerge pull request #582 from bitwangyaoyao:2.4_fixBlend
Andrey Kamaev [Thu, 28 Feb 2013 11:43:50 +0000 (15:43 +0400)]
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend

11 years agoOpenCV version swithed to 4 digit in GUI and package revision number.
Alexander Smorkalov [Wed, 27 Feb 2013 10:03:02 +0000 (14:03 +0400)]
OpenCV version swithed to 4 digit in GUI and package revision number.

11 years agoFix ocl::HOG crash on Intel OCL
yao [Thu, 28 Feb 2013 08:56:39 +0000 (16:56 +0800)]
Fix ocl::HOG crash on Intel OCL

11 years agoMerge pull request #578 from jet47:nmake-ffmpeg-copy
Andrey Kamaev [Thu, 28 Feb 2013 08:56:26 +0000 (12:56 +0400)]
Merge pull request #578 from jet47:nmake-ffmpeg-copy

11 years agoMerge pull request #573 from jet47:config-cross-compilation
Andrey Kamaev [Thu, 28 Feb 2013 08:56:07 +0000 (12:56 +0400)]
Merge pull request #573 from jet47:config-cross-compilation

11 years agoMerge pull request #557 from jet47:gpu-sanity
cuda-geek [Thu, 28 Feb 2013 07:17:12 +0000 (11:17 +0400)]
Merge pull request #557 from jet47:gpu-sanity

11 years agolinux warning fix
yao [Thu, 28 Feb 2013 06:37:37 +0000 (14:37 +0800)]
linux warning fix

11 years agofixed OpenCVConfig for cross-compilation:
Vladislav Vinogradov [Wed, 27 Feb 2013 10:39:28 +0000 (14:39 +0400)]
fixed OpenCVConfig for cross-compilation:

* added CUDA to EXTRA libs if OpenCV uses it
* added -rpath-link option for linker if OpenCV was built as SHARED libs

11 years agoFix ocl::bruteforcematcher crash on Intel OCL
yao [Thu, 28 Feb 2013 06:31:08 +0000 (14:31 +0800)]
Fix ocl::bruteforcematcher crash on Intel OCL

11 years agofixed ffmpeg destination folder for NMake generator
Vladislav Vinogradov [Wed, 27 Feb 2013 12:44:36 +0000 (16:44 +0400)]
fixed ffmpeg destination folder for NMake generator

11 years agofix bug #2787
yao [Thu, 28 Feb 2013 06:05:36 +0000 (14:05 +0800)]
fix bug #2787

11 years agoadjust some test cases, use original template file name in Haar
yao [Thu, 28 Feb 2013 04:15:13 +0000 (12:15 +0800)]
adjust some test cases, use original template file name in Haar

11 years agofix the blend crash in some cases
yao [Thu, 28 Feb 2013 01:03:10 +0000 (09:03 +0800)]
fix the blend crash in some cases

11 years agoRevise git attributes
Andrey Kamaev [Wed, 27 Feb 2013 23:18:54 +0000 (03:18 +0400)]
Revise git attributes

11 years agoMerge pull request #544 from AnnaKogan8:added-regressions-only-option
Andrey Kamaev [Wed, 27 Feb 2013 20:38:47 +0000 (00:38 +0400)]
Merge pull request #544 from AnnaKogan8:added-regressions-only-option

11 years agoMerge pull request #579 from bitwangyaoyao:2.4_perfTest
Andrey Kamaev [Wed, 27 Feb 2013 15:34:17 +0000 (19:34 +0400)]
Merge pull request #579 from bitwangyaoyao:2.4_perfTest

11 years agoMerge pull request #576 from bitwangyaoyao:2.4_customMat2
Andrey Kamaev [Wed, 27 Feb 2013 15:33:53 +0000 (19:33 +0400)]
Merge pull request #576 from bitwangyaoyao:2.4_customMat2

11 years agoMerge pull request #568 from bitwangyaoyao:2.4_moments
Andrey Kamaev [Wed, 27 Feb 2013 15:33:26 +0000 (19:33 +0400)]
Merge pull request #568 from bitwangyaoyao:2.4_moments

11 years agofix build errors
yao [Wed, 27 Feb 2013 13:56:03 +0000 (21:56 +0800)]
fix build errors

11 years agoadjust matchTemplate in performance sample, as current version is too slow when templ...
yao [Wed, 27 Feb 2013 13:41:04 +0000 (21:41 +0800)]
adjust matchTemplate in performance sample, as current version is too slow when template size isn't small

11 years agoFix OpenCVConfig.cmake generated for Android platform (issue #2496)
Andrey Kamaev [Wed, 27 Feb 2013 08:41:33 +0000 (12:41 +0400)]
Fix OpenCVConfig.cmake generated for Android platform (issue #2496)

* fix path to libraries in Android SDK
* allow to link to opencv_java.so as Android.mk does

To link to opencv_java.so you can either change your cmake to find OpenCV as

    find_package(OpenCV opencv_java)

or pass -DOpenCV_FIND_COMPONENTS=opencv_java to your cmake command

11 years agoadd interfaces enable custom oclMat device memory type
yao [Wed, 27 Feb 2013 09:32:32 +0000 (17:32 +0800)]
add interfaces enable custom oclMat device memory type

11 years agoMerge pull request #559 from jet47:gpu-hough-circles
cuda-geek [Wed, 27 Feb 2013 08:29:44 +0000 (12:29 +0400)]
Merge pull request #559 from jet47:gpu-hough-circles

11 years agoMerge pull request #563 from taka-no-me:perf_classify_speedups
Andrey Kamaev [Wed, 27 Feb 2013 07:37:17 +0000 (11:37 +0400)]
Merge pull request #563 from taka-no-me:perf_classify_speedups

11 years agoMerge pull request #556 from bitwangyaoyao:2.4_SURF
Andrey Kamaev [Wed, 27 Feb 2013 07:37:04 +0000 (11:37 +0400)]
Merge pull request #556 from bitwangyaoyao:2.4_SURF

11 years agoMerge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
Andrey Kamaev [Wed, 27 Feb 2013 07:36:40 +0000 (11:36 +0400)]
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame

11 years agoMerge pull request #553 from bitwangyaoyao:2.4_perfTest
Andrey Kamaev [Wed, 27 Feb 2013 07:36:23 +0000 (11:36 +0400)]
Merge pull request #553 from bitwangyaoyao:2.4_perfTest

11 years agoremove the compile warnings
yao [Wed, 27 Feb 2013 06:53:27 +0000 (14:53 +0800)]
remove the compile warnings

11 years agoAdd moments function
yao [Wed, 27 Feb 2013 05:45:16 +0000 (13:45 +0800)]
Add moments function

11 years agofix the compile warnings
yao [Wed, 27 Feb 2013 03:16:46 +0000 (11:16 +0800)]
fix the compile warnings

11 years agopyrlk also take advantages of cl_image support detection
yao [Wed, 27 Feb 2013 02:45:07 +0000 (10:45 +0800)]
pyrlk also take advantages of cl_image support detection

11 years agoPut the cl_image support detection in utils
yao [Wed, 27 Feb 2013 02:24:03 +0000 (10:24 +0800)]
Put the cl_image support detection in utils

11 years agoMerge pull request #565 from cuda-geek:auto-arch
Andrey Kamaev [Tue, 26 Feb 2013 20:05:16 +0000 (00:05 +0400)]
Merge pull request #565 from cuda-geek:auto-arch

11 years agoMerge pull request #564 from apavlenko:eclipse_import_fix
Andrey Kamaev [Tue, 26 Feb 2013 20:05:02 +0000 (00:05 +0400)]
Merge pull request #564 from apavlenko:eclipse_import_fix

11 years agoadd CUDA_GENERATION macro
marina.kolpakova [Tue, 26 Feb 2013 09:02:54 +0000 (13:02 +0400)]
add CUDA_GENERATION macro

11 years agoMerge pull request #561 from asmorkalov:android_tutorial_2_4_4_update
cuda-geek [Tue, 26 Feb 2013 15:58:33 +0000 (19:58 +0400)]
Merge pull request #561 from asmorkalov:android_tutorial_2_4_4_update

11 years agofixing eclipse import errors
Andrey Pavlenko [Tue, 26 Feb 2013 15:52:59 +0000 (19:52 +0400)]
fixing eclipse import errors

11 years agoAdd option --with-score to summary.py to automatically classify speedups
Andrey Kamaev [Tue, 26 Feb 2013 15:37:37 +0000 (19:37 +0400)]
Add option --with-score to summary.py to automatically classify speedups

Legend for new column is:
* FASTER - strong speedup
* faster - spedup is detected but it is unreliable
* <empty> - no change in speed
* slower - slowdown is detected but it is unreliable
* SLOWER - strong slowdown

11 years agoMerge pull request #549 from asmorkalov:android_mips_static_build_fix
Andrey Kamaev [Tue, 26 Feb 2013 15:03:43 +0000 (19:03 +0400)]
Merge pull request #549 from asmorkalov:android_mips_static_build_fix

11 years agoMerge pull request #552 from taka-no-me:fix_invert
Andrey Kamaev [Tue, 26 Feb 2013 14:31:30 +0000 (18:31 +0400)]
Merge pull request #552 from taka-no-me:fix_invert

11 years agoMerge pull request #555 from bitwangyaoyao:2.4_fixFft
Andrey Kamaev [Tue, 26 Feb 2013 14:31:17 +0000 (18:31 +0400)]
Merge pull request #555 from bitwangyaoyao:2.4_fixFft

11 years agoFix ocl::dft the compile warning on Linux
yao [Tue, 26 Feb 2013 13:18:51 +0000 (21:18 +0800)]
Fix ocl::dft the compile warning on Linux

11 years agoAndroid tutorial updated
Alexander Smorkalov [Tue, 26 Feb 2013 12:35:02 +0000 (16:35 +0400)]
Android tutorial updated
OpenCV version incremented;
New CvCameraViewListener interface description added.

11 years agoMerge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
yao [Tue, 26 Feb 2013 12:30:42 +0000 (20:30 +0800)]
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4

11 years agofixed gpu HoughCircles test
Vladislav Vinogradov [Tue, 26 Feb 2013 12:10:35 +0000 (16:10 +0400)]
fixed gpu HoughCircles test

11 years agofixed warp tests
Vladislav Vinogradov [Tue, 26 Feb 2013 09:52:42 +0000 (13:52 +0400)]
fixed warp tests

11 years agofixed gpu bitwise operations with scalars
Vladislav Vinogradov [Tue, 26 Feb 2013 09:50:33 +0000 (13:50 +0400)]
fixed gpu bitwise operations with scalars

11 years agorefactored gpu perf tests and fixed sanity tests
Vladislav Vinogradov [Tue, 26 Feb 2013 09:49:35 +0000 (13:49 +0400)]
refactored gpu perf tests and fixed sanity tests

11 years agoremove the device specific logic
yao [Tue, 26 Feb 2013 09:53:08 +0000 (17:53 +0800)]
remove the device specific logic

11 years agoFix ocl::dft error when program end on Linux
yao [Tue, 26 Feb 2013 09:44:19 +0000 (17:44 +0800)]
Fix ocl::dft error when program end on Linux

11 years agoSimplify the bind texture logic of interpolate frame function
yao [Tue, 26 Feb 2013 09:12:03 +0000 (17:12 +0800)]
Simplify the bind texture logic of interpolate frame function

11 years agofix the mismatch of perf_test, add a performance sample for ocl module
yao [Tue, 26 Feb 2013 08:52:30 +0000 (16:52 +0800)]
fix the mismatch of perf_test, add a performance sample for ocl module

11 years agoFeature #2833 Sepia size in Image Manipulations demo implemented.
Alexander Smorkalov [Tue, 26 Feb 2013 07:25:33 +0000 (11:25 +0400)]
Feature #2833 Sepia size in Image Manipulations demo implemented.

11 years agoFix invert under MSVC
Andrey Kamaev [Tue, 26 Feb 2013 07:16:57 +0000 (11:16 +0400)]
Fix invert under MSVC

11 years agoAdded --regressions-only=X-FACTOR option
Anna Kogan [Mon, 25 Feb 2013 15:03:26 +0000 (19:03 +0400)]
Added --regressions-only=X-FACTOR  option

11 years agoStatic ANdroid samples build for MIPS fixed
Alexander Smorkalov [Tue, 26 Feb 2013 06:32:10 +0000 (10:32 +0400)]
Static ANdroid samples build for MIPS fixed

11 years agoMerge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_...
Andrey Kamaev [Mon, 25 Feb 2013 21:00:54 +0000 (01:00 +0400)]
Merge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_algorithm

11 years agoMerge pull request #547 from vpisarev:fixes_244
Andrey Kamaev [Mon, 25 Feb 2013 21:00:36 +0000 (01:00 +0400)]
Merge pull request #547 from vpisarev:fixes_244

11 years agoreplaced tabs with spaces
Vadim Pisarevsky [Mon, 25 Feb 2013 19:10:38 +0000 (23:10 +0400)]
replaced tabs with spaces

11 years agoattempt to make the ultimate fix for the failure in Core_Invert.small
Vadim Pisarevsky [Mon, 25 Feb 2013 18:46:30 +0000 (22:46 +0400)]
attempt to make the ultimate fix for the failure in Core_Invert.small

11 years agofixed Core_MulSpectrums failure
Vadim Pisarevsky [Mon, 25 Feb 2013 18:02:24 +0000 (22:02 +0400)]
fixed Core_MulSpectrums failure