platform/upstream/opencv.git
11 years agoMerge pull request #718 from apavlenko:java_tests_fix
Andrey Kamaev [Fri, 29 Mar 2013 14:21:14 +0000 (18:21 +0400)]
Merge pull request #718 from apavlenko:java_tests_fix

11 years agoMerge pull request #707 from pengx17:2.4_surf
Andrey Kamaev [Fri, 29 Mar 2013 14:20:45 +0000 (18:20 +0400)]
Merge pull request #707 from pengx17:2.4_surf

11 years agoMerge pull request #704 from taka-no-me:folders
Andrey Kamaev [Fri, 29 Mar 2013 14:20:26 +0000 (18:20 +0400)]
Merge pull request #704 from taka-no-me:folders

11 years agoFix for encoding errors when building Java source
Alexander Bohn / FI$H2k [Fri, 15 Mar 2013 09:47:52 +0000 (06:47 -0300)]
Fix for encoding errors when building Java source

The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e04222deea30ffe4e89456c220bc75ff1a)

11 years agoMerge pull request #715 from pengx17:2.4_canny_buf
Andrey Kamaev [Wed, 27 Mar 2013 09:19:40 +0000 (13:19 +0400)]
Merge pull request #715 from pengx17:2.4_canny_buf

11 years agoMerge pull request #712 from apavlenko:fix-2912
Andrey Kamaev [Wed, 27 Mar 2013 09:19:27 +0000 (13:19 +0400)]
Merge pull request #712 from apavlenko:fix-2912

11 years agoFix OCL Canny
peng xiao [Wed, 27 Mar 2013 07:08:51 +0000 (15:08 +0800)]
Fix OCL Canny

11 years agoDisable ocl::SURF accurate test
peng xiao [Wed, 27 Mar 2013 05:25:08 +0000 (13:25 +0800)]
Disable ocl::SURF accurate test

11 years agoFix compiler errors
peng xiao [Wed, 27 Mar 2013 00:56:31 +0000 (08:56 +0800)]
Fix compiler errors

11 years agofix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
Andrey Pavlenko [Tue, 26 Mar 2013 15:31:16 +0000 (19:31 +0400)]
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)

11 years agoMerge pull request #705 from bitwangyaoyao:2.4_oclFix
Andrey Kamaev [Tue, 26 Mar 2013 14:38:36 +0000 (18:38 +0400)]
Merge pull request #705 from bitwangyaoyao:2.4_oclFix

11 years agoMerge pull request #710 from jet47:gpu-fix-compilation-issues
Andrey Kamaev [Tue, 26 Mar 2013 11:31:22 +0000 (15:31 +0400)]
Merge pull request #710 from jet47:gpu-fix-compilation-issues

11 years agoFix compiler errors
peng xiao [Tue, 26 Mar 2013 09:23:38 +0000 (17:23 +0800)]
Fix compiler errors

11 years agoFix compiler errors
peng xiao [Tue, 26 Mar 2013 08:40:30 +0000 (16:40 +0800)]
Fix compiler errors

11 years agofixed compilation issues with gpu modules:
Vladislav Vinogradov [Tue, 26 Mar 2013 08:33:13 +0000 (12:33 +0400)]
fixed compilation issues with gpu modules:

* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows

11 years agoPass warp size into SURF
peng xiao [Tue, 26 Mar 2013 07:48:15 +0000 (15:48 +0800)]
Pass warp size into SURF

11 years agoAdd a function to query ocl device info
peng xiao [Tue, 26 Mar 2013 07:36:49 +0000 (15:36 +0800)]
Add a function to query ocl device info

Currently the function only supports wavefront size query

11 years agomore fix
yao [Tue, 26 Mar 2013 06:23:26 +0000 (14:23 +0800)]
more fix

11 years agomore fix of mismatch
yao [Tue, 26 Mar 2013 06:10:29 +0000 (14:10 +0800)]
more fix of mismatch

11 years agomore fix of mismatch functions on CPU OCL
yao [Tue, 26 Mar 2013 05:41:13 +0000 (13:41 +0800)]
more fix of mismatch functions on CPU OCL

11 years agofix some mismatch
yao [Tue, 26 Mar 2013 05:05:01 +0000 (13:05 +0800)]
fix some mismatch

11 years agodiscard comments in kernels.cpp
yao [Tue, 26 Mar 2013 04:01:01 +0000 (12:01 +0800)]
discard comments in kernels.cpp

11 years agoAdd a macro to call additional barrier function on the fly
peng xiao [Tue, 26 Mar 2013 03:51:02 +0000 (11:51 +0800)]
Add a macro to call additional barrier function on the fly

11 years agofix amdFft and amdBlas path
yao [Tue, 26 Mar 2013 03:48:14 +0000 (11:48 +0800)]
fix amdFft and amdBlas path

11 years agoDrop outdated targets and fix solution folders
Andrey Kamaev [Mon, 25 Mar 2013 17:57:53 +0000 (21:57 +0400)]
Drop outdated targets and fix solution folders

11 years agoMerge pull request #701 from jet47:clahe
Andrey Kamaev [Mon, 25 Mar 2013 16:26:22 +0000 (20:26 +0400)]
Merge pull request #701 from jet47:clahe

11 years agoGPU implementation of CLAHE
Vladislav Vinogradov [Mon, 25 Mar 2013 11:39:07 +0000 (15:39 +0400)]
GPU implementation of CLAHE

11 years agoCPU implementation of CLAHE
Vladislav Vinogradov [Mon, 25 Mar 2013 11:38:43 +0000 (15:38 +0400)]
CPU implementation of CLAHE

11 years agoMerge pull request #698 from vpisarev/ms_visimage_tut24
Andrey Kamaev [Mon, 25 Mar 2013 10:29:13 +0000 (03:29 -0700)]
Merge pull request #698 from vpisarev/ms_visimage_tut24

added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio

11 years agoMerge pull request #697 from Nerei/ios_png_jpeg
Andrey Kamaev [Mon, 25 Mar 2013 10:28:29 +0000 (03:28 -0700)]
Merge pull request #697 from Nerei/ios_png_jpeg

Enabled png and jpeg for iOS

11 years agoenabled png and jpeg for iOS
Anatoly Baksheev [Sun, 24 Mar 2013 16:07:55 +0000 (20:07 +0400)]
enabled png and jpeg for iOS

11 years agoadded tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
Vadim Pisarevsky [Sun, 24 Mar 2013 19:48:35 +0000 (23:48 +0400)]
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio

11 years agoMerge pull request #691 from vpisarev:fix_2899
Andrey Kamaev [Fri, 22 Mar 2013 13:18:54 +0000 (17:18 +0400)]
Merge pull request #691 from vpisarev:fix_2899

11 years agoMerge pull request #688 from jet47:fix-nonfree-compilation
Andrey Kamaev [Fri, 22 Mar 2013 13:18:40 +0000 (17:18 +0400)]
Merge pull request #688 from jet47:fix-nonfree-compilation

11 years agoMerge pull request #683 from jet47:gpu-license
Andrey Kamaev [Fri, 22 Mar 2013 13:18:14 +0000 (17:18 +0400)]
Merge pull request #683 from jet47:gpu-license

11 years agoremoved extra whitespaces
Vadim Pisarevsky [Fri, 22 Mar 2013 11:12:55 +0000 (15:12 +0400)]
removed extra whitespaces

11 years agofixed http://code.opencv.org/issues/2899
Vadim Pisarevsky [Fri, 22 Mar 2013 11:10:54 +0000 (15:10 +0400)]
fixed http://code.opencv.org/issues/2899

11 years agoMerge pull request #687 from vpisarev:fast_lin_svm2
Vadim Pisarevsky [Fri, 22 Mar 2013 10:34:44 +0000 (14:34 +0400)]
Merge pull request #687 from vpisarev:fast_lin_svm2

11 years agoupdated license header in whole gpu module
Vladislav Vinogradov [Thu, 21 Mar 2013 09:31:51 +0000 (13:31 +0400)]
updated license header in whole gpu module

11 years agofixed nonfree compilation with gpu (perf tests)
Vladislav Vinogradov [Fri, 22 Mar 2013 06:20:50 +0000 (10:20 +0400)]
fixed nonfree compilation with gpu (perf tests)

11 years agofixed buffer size and restored the use of compressed files in ml's load_save tests.
Vadim Pisarevsky [Thu, 21 Mar 2013 21:53:41 +0000 (01:53 +0400)]
fixed buffer size and restored the use of compressed files in ml's load_save tests.

11 years agoMerge pull request #664 from taka-no-me/ocl
Andrey Kamaev [Thu, 21 Mar 2013 16:01:59 +0000 (09:01 -0700)]
Merge pull request #664 from taka-no-me/ocl

Move OpenCL SURF to nonfree module

11 years agoMerge pull request #686 from taka-no-me/stereobm_sobel
Andrey Kamaev [Thu, 21 Mar 2013 15:59:59 +0000 (08:59 -0700)]
Merge pull request #686 from taka-no-me/stereobm_sobel

Fixed wrong index in prefilterXSobel function

11 years agoMerge pull request #676 from vpisarev/svd_stuff
Andrey Kamaev [Thu, 21 Mar 2013 15:59:48 +0000 (08:59 -0700)]
Merge pull request #676 from vpisarev/svd_stuff

added test for bug #1448 and hopefully fixes the bug #2898

11 years agoMerge pull request #675 from jet47/gpu-test-fixes
Andrey Kamaev [Thu, 21 Mar 2013 15:59:34 +0000 (08:59 -0700)]
Merge pull request #675 from jet47/gpu-test-fixes

GPU test fixes

11 years agoadd hack to disable optimization of linear svms; improved precision of optimize_linea...
Vadim Pisarevsky [Thu, 21 Mar 2013 15:17:59 +0000 (19:17 +0400)]
add hack to disable optimization of linear svms; improved precision of optimize_linear_svm; add the relevant test, which however requires some big database (so it's disabled by default)

11 years agoFix build errors
Andrey Kamaev [Mon, 18 Mar 2013 10:42:27 +0000 (14:42 +0400)]
Fix build errors

11 years agoFixed wrong in row index of SSE implementation in prefilterXSobel function.
Dong Nguyen [Wed, 20 Mar 2013 03:56:13 +0000 (10:56 +0700)]
Fixed wrong in row index of SSE implementation in prefilterXSobel function.

11 years agoMove OpenCl SURF perf tests to nonfree and fix build of samples
Andrey Kamaev [Mon, 18 Mar 2013 08:45:52 +0000 (12:45 +0400)]
Move OpenCl SURF perf tests to nonfree and fix build of samples

11 years agoDisable crashing ocl tests
Andrey Kamaev [Sun, 17 Mar 2013 22:32:20 +0000 (02:32 +0400)]
Disable crashing ocl tests

11 years agoRefactor OpenCL initialization and allow to use ocl module witout explicit setup
Andrey Kamaev [Sun, 17 Mar 2013 21:59:24 +0000 (01:59 +0400)]
Refactor OpenCL initialization and allow to use ocl module witout explicit setup

11 years agoTrying to make ocl surf work
Andrey Kamaev [Sat, 16 Mar 2013 21:14:45 +0000 (01:14 +0400)]
Trying to make ocl surf work

1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.

11 years agoSURF accuracy test is moved to nonfree
Andrey Kamaev [Sat, 16 Mar 2013 15:34:39 +0000 (19:34 +0400)]
SURF accuracy test is moved to nonfree

11 years agoMove OpenCL SURF to nonfree module
Andrey Kamaev [Sat, 16 Mar 2013 11:47:40 +0000 (15:47 +0400)]
Move OpenCL SURF to nonfree module

11 years agoAllow OpenCL acceleration in every OpenCV module
Andrey Kamaev [Fri, 15 Mar 2013 19:56:31 +0000 (23:56 +0400)]
Allow OpenCL acceleration in every OpenCV module

11 years agoRefactor OpenCL search
Andrey Kamaev [Fri, 15 Mar 2013 19:29:22 +0000 (23:29 +0400)]
Refactor OpenCL search

11 years agoTurn on OpenCL by default
Andrey Kamaev [Fri, 15 Mar 2013 16:56:29 +0000 (20:56 +0400)]
Turn on OpenCL by default

11 years agoexploring possible bug in optimize_linear_svm
Vadim Pisarevsky [Thu, 21 Mar 2013 13:00:08 +0000 (17:00 +0400)]
exploring possible bug in optimize_linear_svm

11 years agoMerge pull request #679 from jet47:gpu-simd-functions
Andrey Kamaev [Thu, 21 Mar 2013 10:59:55 +0000 (14:59 +0400)]
Merge pull request #679 from jet47:gpu-simd-functions

11 years agoMerge pull request #677 from jet47:gpu-lut-fix
Andrey Kamaev [Thu, 21 Mar 2013 10:48:03 +0000 (14:48 +0400)]
Merge pull request #677 from jet47:gpu-lut-fix

11 years agoMerge pull request #662 from asmorkalov:android_native_activity
Andrey Kamaev [Thu, 21 Mar 2013 10:47:13 +0000 (14:47 +0400)]
Merge pull request #662 from asmorkalov:android_native_activity

11 years agoadded simd_functions.hpp to device layer
Vladislav Vinogradov [Wed, 20 Mar 2013 12:27:58 +0000 (16:27 +0400)]
added simd_functions.hpp to device layer

11 years agofixed minMax perf test
Vladislav Vinogradov [Thu, 21 Mar 2013 08:18:56 +0000 (12:18 +0400)]
fixed minMax perf test

11 years agodisable tests that requires video support if it is not available
Vladislav Vinogradov [Wed, 20 Mar 2013 07:50:42 +0000 (11:50 +0400)]
disable tests that requires video support if it is not available

11 years agoincreased epsilon in sanity test
Vladislav Vinogradov [Wed, 20 Mar 2013 07:49:58 +0000 (11:49 +0400)]
increased epsilon in sanity test

11 years agoincreased time limits in perf tests
Vladislav Vinogradov [Wed, 20 Mar 2013 07:49:33 +0000 (11:49 +0400)]
increased time limits in perf tests

11 years agofixed gpu::LUT on multi device system
Vladislav Vinogradov [Wed, 20 Mar 2013 08:31:21 +0000 (12:31 +0400)]
fixed gpu::LUT on multi device system

11 years agoMerge pull request #669 from vpisarev:fast_lin_svm
Vadim Pisarevsky [Thu, 21 Mar 2013 08:22:35 +0000 (12:22 +0400)]
Merge pull request #669 from vpisarev:fast_lin_svm

11 years agoMerge pull request #656 from jet47:gpu-nonfree
cuda-geek [Thu, 21 Mar 2013 04:57:08 +0000 (08:57 +0400)]
Merge pull request #656 from jet47:gpu-nonfree

11 years agoadded test for bug #1448 and hopefully fixes the bug #2898
Vadim Pisarevsky [Wed, 20 Mar 2013 07:58:19 +0000 (11:58 +0400)]
added test for bug #1448 and hopefully fixes the bug #2898

11 years agoadded load/save feature for SVM classifier in letter_recog sample
Vadim Pisarevsky [Tue, 19 Mar 2013 14:41:38 +0000 (18:41 +0400)]
added load/save feature for SVM classifier in letter_recog sample

11 years agodramatic speedup of SVM::predict in the case of linear SVM
Vadim Pisarevsky [Tue, 19 Mar 2013 14:28:17 +0000 (18:28 +0400)]
dramatic speedup of SVM::predict in the case of linear SVM

11 years agoCode refactoring was done.
Alexander Smorkalov [Tue, 12 Mar 2013 07:33:46 +0000 (11:33 +0400)]
Code refactoring was done.

11 years agomerged gpunonfree and nonfree module
Vladislav Vinogradov [Mon, 18 Mar 2013 12:14:37 +0000 (16:14 +0400)]
merged gpunonfree and nonfree module

11 years agoMerge pull request #663 from asmorkalov:manager_tegra4
Andrey Kamaev [Mon, 18 Mar 2013 12:00:54 +0000 (16:00 +0400)]
Merge pull request #663 from asmorkalov:manager_tegra4

11 years agoMerge pull request #652 from Daniil-Osokin:fixCvtColorHeader
Andrey Kamaev [Mon, 18 Mar 2013 11:56:33 +0000 (15:56 +0400)]
Merge pull request #652 from Daniil-Osokin:fixCvtColorHeader

11 years agofixed warnings
Vladislav Vinogradov [Fri, 15 Mar 2013 13:58:18 +0000 (17:58 +0400)]
fixed warnings

11 years agomoved SURF_GPU and VIBE to gpunonfree module
Vladislav Vinogradov [Fri, 15 Mar 2013 10:09:39 +0000 (14:09 +0400)]
moved SURF_GPU and VIBE to gpunonfree module

11 years agomoved utility functions from gpu_perf_test and gpu_test to ts module
Vladislav Vinogradov [Fri, 15 Mar 2013 10:09:10 +0000 (14:09 +0400)]
moved utility functions from gpu_perf_test and gpu_test to ts module

11 years agoTegra4 support added.
Alexander Smorkalov [Mon, 18 Mar 2013 08:12:17 +0000 (12:12 +0400)]
Tegra4 support added.

11 years agoInitialization with Manager instead static link added.
Alexander Smorkalov [Thu, 7 Mar 2013 11:13:30 +0000 (15:13 +0400)]
Initialization with Manager instead static link added.

11 years agoBase for Native Activity example added.
Alexander Smorkalov [Mon, 4 Mar 2013 10:49:33 +0000 (14:49 +0400)]
Base for Native Activity example added.

11 years agoAdded missing enums for cvtColor RGB to YUV420p
Daniil Osokin [Thu, 14 Mar 2013 17:19:08 +0000 (21:19 +0400)]
Added missing enums for cvtColor RGB to YUV420p

11 years agoMerge pull request #660 from Nerei:2.4
cuda-geek [Sun, 17 Mar 2013 19:00:04 +0000 (23:00 +0400)]
Merge pull request #660 from Nerei:2.4

11 years agoMerge pull request #532 from jet47:super-resolution
Vadim Pisarevsky [Sun, 17 Mar 2013 15:13:37 +0000 (19:13 +0400)]
Merge pull request #532 from jet47:super-resolution

11 years agobugfix in sample to support LBP classifier. To merge to master also.
Anatoly Baksheev [Sun, 17 Mar 2013 14:43:55 +0000 (18:43 +0400)]
bugfix in sample to support LBP classifier. To merge to master also.

11 years agoMerge pull request #644 from jet47:gpu-debayer-mht
cuda-geek [Fri, 15 Mar 2013 09:55:03 +0000 (13:55 +0400)]
Merge pull request #644 from jet47:gpu-debayer-mht

11 years agoMerge pull request #632 from pengx17:2.4
Andrey Kamaev [Fri, 15 Mar 2013 06:34:43 +0000 (10:34 +0400)]
Merge pull request #632 from pengx17:2.4

11 years agoMerge pull request #631 from bitwangyaoyao:2.4_stereo
Andrey Kamaev [Fri, 15 Mar 2013 06:34:27 +0000 (10:34 +0400)]
Merge pull request #631 from bitwangyaoyao:2.4_stereo

11 years agoimplemented Malvar, He, and Cutler Bayer Demosaicing on gpu
Vladislav Vinogradov [Wed, 13 Mar 2013 10:54:06 +0000 (14:54 +0400)]
implemented Malvar, He, and Cutler Bayer Demosaicing on gpu

11 years agoMerge pull request #638 from bitwangyaoyao:2.4_fixErode
Andrey Kamaev [Thu, 14 Mar 2013 07:41:02 +0000 (11:41 +0400)]
Merge pull request #638 from bitwangyaoyao:2.4_fixErode

11 years agoMerge pull request #628 from bitwangyaoyao:2.4_fixMoments
Andrey Kamaev [Thu, 14 Mar 2013 07:40:47 +0000 (11:40 +0400)]
Merge pull request #628 from bitwangyaoyao:2.4_fixMoments

11 years agoMerge remote-tracking branch 'upstream/2.4' into 2.4
peng xiao [Thu, 14 Mar 2013 01:24:45 +0000 (09:24 +0800)]
Merge remote-tracking branch 'upstream/2.4' into 2.4

11 years agoFix a bug in ocl::Erode/Dilate, simplify the host logic
yao [Tue, 12 Mar 2013 08:45:43 +0000 (16:45 +0800)]
Fix a bug in ocl::Erode/Dilate, simplify the host logic

11 years agoRemove unnecessary HAVE_OPENCL macro block.
peng xiao [Tue, 12 Mar 2013 01:10:15 +0000 (09:10 +0800)]
Remove unnecessary HAVE_OPENCL macro block.

11 years agofix warnings on Linux
yao [Tue, 12 Mar 2013 00:55:50 +0000 (08:55 +0800)]
fix warnings on Linux

11 years agoMerge pull request #633 from jet47:gpu-debayer-gray
Andrey Kamaev [Mon, 11 Mar 2013 17:15:00 +0000 (21:15 +0400)]
Merge pull request #633 from jet47:gpu-debayer-gray

11 years agoMerge pull request #630 from asmorkalov:android_view_stretch
Andrey Kamaev [Mon, 11 Mar 2013 17:14:43 +0000 (21:14 +0400)]
Merge pull request #630 from asmorkalov:android_view_stretch

11 years agoFix clang + ccache build warnings
Andrey Kamaev [Mon, 11 Mar 2013 14:40:40 +0000 (18:40 +0400)]
Fix clang + ccache build warnings

11 years agoMerge pull request #635 from taka-no-me:c++11
Andrey Kamaev [Mon, 11 Mar 2013 13:35:46 +0000 (17:35 +0400)]
Merge pull request #635 from taka-no-me:c++11