platform/upstream/opencv.git
10 years agoremoved comments from filtering.cpp and imgproc.cpp in ocl module
Ilya Lavrenov [Tue, 24 Sep 2013 09:43:12 +0000 (13:43 +0400)]
removed comments from filtering.cpp and imgproc.cpp in ocl module

10 years agoremoved ocl::magnitudeSqr
Ilya Lavrenov [Tue, 24 Sep 2013 09:39:07 +0000 (13:39 +0400)]
removed ocl::magnitudeSqr

10 years agorefactored and extended arithm operations add/sub/mul/div/absdiff
Ilya Lavrenov [Tue, 24 Sep 2013 09:34:55 +0000 (13:34 +0400)]
refactored and extended arithm operations add/sub/mul/div/absdiff

10 years agomarked some methods of ocl::Context as const
Ilya Lavrenov [Tue, 24 Sep 2013 09:17:09 +0000 (13:17 +0400)]
marked some methods of ocl::Context as const

10 years agoremoved needless arithm_2_mat.cl file
Ilya Lavrenov [Tue, 24 Sep 2013 09:15:05 +0000 (13:15 +0400)]
removed needless arithm_2_mat.cl file

10 years agoMerge pull request #1489 from melody-rain:2_4_knearest_neighbor
Alexander Smorkalov [Mon, 23 Sep 2013 09:34:38 +0000 (13:34 +0400)]
Merge pull request #1489 from melody-rain:2_4_knearest_neighbor

10 years agoMerge pull request #1482 from ilya-lavrenov:ocl_setTO
Alexander Smorkalov [Mon, 23 Sep 2013 08:56:19 +0000 (12:56 +0400)]
Merge pull request #1482 from ilya-lavrenov:ocl_setTO

10 years agoMerge pull request #1487 from alalek:fix_add_definitions
Alexander Smorkalov [Mon, 23 Sep 2013 08:54:19 +0000 (12:54 +0400)]
Merge pull request #1487 from alalek:fix_add_definitions

10 years agoRemoved unused constructor.
Jin Ma [Mon, 23 Sep 2013 07:10:00 +0000 (15:10 +0800)]
Removed unused constructor.

10 years agoMerge pull request #1483 from kecsap:nbayes
Alexander Smorkalov [Mon, 23 Sep 2013 06:26:44 +0000 (10:26 +0400)]
Merge pull request #1483 from kecsap:nbayes

10 years agoAdded knearest neighbor of OpenCL version.
Jin Ma [Sun, 22 Sep 2013 02:23:54 +0000 (10:23 +0800)]
Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.

10 years agoAdded knearest neighbor of OpenCL version.
Jin Ma [Sun, 22 Sep 2013 02:22:09 +0000 (10:22 +0800)]
Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.

10 years agocmake: fixed incorrect usage of add_definitions() on Linux
Alexander Alekhin [Sat, 21 Sep 2013 17:12:39 +0000 (21:12 +0400)]
cmake: fixed incorrect usage of add_definitions() on Linux

10 years agoFix a memory leak in CvNormalBayesClassifier::train()
Csaba Kertesz [Wed, 18 Sep 2013 19:49:32 +0000 (21:49 +0200)]
Fix a memory leak in CvNormalBayesClassifier::train()

10 years agofixed ocl::oclMat::setTo for 2-channel images
Ilya Lavrenov [Fri, 20 Sep 2013 10:22:18 +0000 (14:22 +0400)]
fixed ocl::oclMat::setTo for 2-channel images

10 years agoMerge pull request #1448 from StevenPuttemans:bugfix_3264
Alexander Smorkalov [Fri, 20 Sep 2013 06:55:23 +0000 (10:55 +0400)]
Merge pull request #1448 from StevenPuttemans:bugfix_3264

10 years agoMerge pull request #1468 from alalek:fix_alignSize_usage
Andrey Pavlenko [Wed, 18 Sep 2013 09:30:38 +0000 (13:30 +0400)]
Merge pull request #1468 from alalek:fix_alignSize_usage

10 years agoocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
Alexander Alekhin [Tue, 17 Sep 2013 21:14:41 +0000 (01:14 +0400)]
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp

10 years agoMerge pull request #1460 from ilya-lavrenov:ocl_divUp
Alexander Smorkalov [Tue, 17 Sep 2013 11:37:44 +0000 (15:37 +0400)]
Merge pull request #1460 from ilya-lavrenov:ocl_divUp

10 years agoMerge pull request #1461 from ilya-lavrenov:ocl_dataOperations
Alexander Smorkalov [Tue, 17 Sep 2013 11:21:34 +0000 (15:21 +0400)]
Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations

10 years agoMerge pull request #1439 from ilya-lavrenov:convertTo
Alexander Smorkalov [Tue, 17 Sep 2013 11:12:01 +0000 (15:12 +0400)]
Merge pull request #1439 from ilya-lavrenov:convertTo

10 years agoMerge pull request #1449 from SpecLad:dc1394-095
Alexander Smorkalov [Tue, 17 Sep 2013 10:36:30 +0000 (14:36 +0400)]
Merge pull request #1449 from SpecLad:dc1394-095

10 years agoMerge pull request #1452 from alalek:fix_cv_export_templates
Alexander Smorkalov [Tue, 17 Sep 2013 10:35:40 +0000 (14:35 +0400)]
Merge pull request #1452 from alalek:fix_cv_export_templates

10 years agoMerge pull request #1454 from ilya-lavrenov:ocl_pyrUp
Andrey Pavlenko [Tue, 17 Sep 2013 10:03:40 +0000 (14:03 +0400)]
Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp

10 years agoMerge pull request #1455 from ilya-lavrenov:ocl_test_output
Alexander Smorkalov [Tue, 17 Sep 2013 09:18:51 +0000 (13:18 +0400)]
Merge pull request #1455 from ilya-lavrenov:ocl_test_output

10 years agoadded performance tests for data transfer operations
Ilya Lavrenov [Mon, 16 Sep 2013 14:55:37 +0000 (18:55 +0400)]
added performance tests for data transfer operations

10 years agoremoved needless divUp
Ilya Lavrenov [Mon, 16 Sep 2013 11:11:56 +0000 (15:11 +0400)]
removed needless divUp

10 years agoremoved useless output
Ilya Lavrenov [Fri, 13 Sep 2013 07:27:25 +0000 (11:27 +0400)]
removed useless output

10 years agofixed ocl::pyrUp for 2-byte types
Ilya Lavrenov [Sun, 15 Sep 2013 15:56:05 +0000 (19:56 +0400)]
fixed ocl::pyrUp for 2-byte types

10 years agoremove CV_EXPORT from templates
Alexander Alekhin [Sun, 15 Sep 2013 03:05:30 +0000 (07:05 +0400)]
remove CV_EXPORT from templates

10 years agoMerge pull request #1444 from ilya-lavrenov:ocl_test_mog
Andrey Pavlenko [Fri, 13 Sep 2013 15:53:20 +0000 (19:53 +0400)]
Merge pull request #1444 from ilya-lavrenov:ocl_test_mog

10 years agoDropped the HAVE_DC1394_095 configuration macro.
Roman Donchenko [Fri, 13 Sep 2013 13:25:21 +0000 (17:25 +0400)]
Dropped the HAVE_DC1394_095 configuration macro.

We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.

Note that 1.0 doesn't have the do_extra_buffering parameter.

10 years agoAdded typo in docs of tutorial
StevenPuttemans [Fri, 13 Sep 2013 13:01:18 +0000 (15:01 +0200)]
Added typo in docs of tutorial

10 years agodisabled MOG tests if no video input support
Ilya Lavrenov [Fri, 13 Sep 2013 08:47:25 +0000 (12:47 +0400)]
disabled MOG tests if no video input support

10 years agoMerge pull request #1434 from melody-rain:Added_perf_kalman_cpp
Roman Donchenko [Thu, 12 Sep 2013 12:54:21 +0000 (16:54 +0400)]
Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp

10 years agoMerge pull request #1440 from SpecLad:wcast-align
Roman Donchenko [Thu, 12 Sep 2013 09:56:23 +0000 (13:56 +0400)]
Merge pull request #1440 from SpecLad:wcast-align

10 years agoRevert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
Roman Donchenko [Thu, 12 Sep 2013 08:58:10 +0000 (12:58 +0400)]
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"

This reverts commit 41b8479d039bb0ecc36627ae50349b6fcd5e16e3, reversing
changes made to 531471b0aa4b4e8f9fcab8282d5cbe895b77e6e0.

Reason: breaks the build.

10 years agoMerge pull request #1428 from ilya-lavrenov:ocl_pyr
Roman Donchenko [Thu, 12 Sep 2013 08:48:44 +0000 (12:48 +0400)]
Merge pull request #1428 from ilya-lavrenov:ocl_pyr

10 years agoextended ocl::convertTo
Ilya Lavrenov [Wed, 11 Sep 2013 09:35:39 +0000 (13:35 +0400)]
extended ocl::convertTo

10 years agoSilenced a few -Wcast-align warnings in the headers.
Roman Donchenko [Thu, 12 Sep 2013 08:31:13 +0000 (12:31 +0400)]
Silenced a few -Wcast-align warnings in the headers.

We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.

10 years agoMerge pull request #1418 from vpisarev:24_ipp_sepfilter_dft
Roman Donchenko [Thu, 12 Sep 2013 08:19:36 +0000 (12:19 +0400)]
Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft

10 years agoMerge pull request #1386 from asmorkalov:android_abic_check_opt_java
Roman Donchenko [Thu, 12 Sep 2013 08:18:54 +0000 (12:18 +0400)]
Merge pull request #1386 from asmorkalov:android_abic_check_opt_java

10 years agoSome improvements in ABI compatibility checker config generator.
Alexander Smorkalov [Mon, 2 Sep 2013 13:52:07 +0000 (17:52 +0400)]
Some improvements in ABI compatibility checker config generator.

JNI check became optional;
Pathes to SDK, NDK and Java API level can be defined by command line.

10 years agoRevised the code according to the feedback of the community.
Jin Ma [Thu, 12 Sep 2013 01:43:30 +0000 (09:43 +0800)]
Revised the code according to the feedback of the community.

10 years agoMerge pull request #1432 from SpecLad:unseq
Roman Donchenko [Wed, 11 Sep 2013 09:50:35 +0000 (13:50 +0400)]
Merge pull request #1432 from SpecLad:unseq

10 years agoMerge pull request #1431 from asmorkalov:android_recording_hint
Roman Donchenko [Wed, 11 Sep 2013 09:50:02 +0000 (13:50 +0400)]
Merge pull request #1431 from asmorkalov:android_recording_hint

10 years agoRemoved whitespace.
Jin Ma [Wed, 11 Sep 2013 03:28:36 +0000 (11:28 +0800)]
Removed whitespace.

10 years agoAdded performance for Kalman Filter.
Jin Ma [Wed, 11 Sep 2013 02:19:02 +0000 (10:19 +0800)]
Added performance for Kalman Filter.

10 years agoMerge pull request #1421 from ilya-lavrenov:ocl_bilateral
Roman Donchenko [Tue, 10 Sep 2013 14:59:41 +0000 (18:59 +0400)]
Merge pull request #1421 from ilya-lavrenov:ocl_bilateral

10 years agoMediaRecorder hint enabled for all Android devices with API level 14 and above.
Alexander Smorkalov [Tue, 10 Sep 2013 14:05:45 +0000 (18:05 +0400)]
MediaRecorder hint enabled for all Android devices with API level 14 and above.

It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.

10 years agoEliminated unsequenced assignments to temp3 from dpstereo.cpp.
Roman Donchenko [Tue, 10 Sep 2013 14:05:23 +0000 (18:05 +0400)]
Eliminated unsequenced assignments to temp3 from dpstereo.cpp.

They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.

10 years agoadded CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl...
Ilya Lavrenov [Tue, 10 Sep 2013 07:53:34 +0000 (11:53 +0400)]
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown

10 years agoMerge pull request #1417 from ilya-lavrenov:merge_fix
Roman Donchenko [Tue, 10 Sep 2013 07:33:24 +0000 (11:33 +0400)]
Merge pull request #1417 from ilya-lavrenov:merge_fix

10 years agoMerge pull request #1420 from ilya-lavrenov:ocl_perf_hog
Roman Donchenko [Tue, 10 Sep 2013 07:32:34 +0000 (11:32 +0400)]
Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog

10 years agoMerge pull request #1413 from melody-rain:2.4_kalman_filter
Roman Donchenko [Tue, 10 Sep 2013 07:28:21 +0000 (11:28 +0400)]
Merge pull request #1413 from melody-rain:2.4_kalman_filter

10 years agoMerge pull request #1376 from StevenPuttemans:bugfix_3186
Roman Donchenko [Mon, 9 Sep 2013 14:33:11 +0000 (18:33 +0400)]
Merge pull request #1376 from StevenPuttemans:bugfix_3186

10 years agoincreased time limit for bilateral filter performance tests
Ilya Lavrenov [Mon, 9 Sep 2013 14:04:52 +0000 (18:04 +0400)]
increased time limit for bilateral filter performance tests

10 years agofixed HOG perf test
Ilya Lavrenov [Mon, 9 Sep 2013 13:16:47 +0000 (17:16 +0400)]
fixed HOG perf test

10 years agoMerge pull request #1412 from jet47:gpu-match-template-nocuda
Roman Donchenko [Mon, 9 Sep 2013 12:49:33 +0000 (16:49 +0400)]
Merge pull request #1412 from jet47:gpu-match-template-nocuda

10 years agoMerge pull request #1365 from bitwangyaoyao:2.4_bilateral
Roman Donchenko [Mon, 9 Sep 2013 12:46:32 +0000 (16:46 +0400)]
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral

10 years agoadded IPP optimization of separable 32f filters; fixed IPP version check in DFT;...
Vadim Pisarevsky [Mon, 9 Sep 2013 12:13:39 +0000 (16:13 +0400)]
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.

10 years agofixed ocl::merge in case of 2 and types CV_32S and CV_32F
Ilya Lavrenov [Mon, 9 Sep 2013 11:32:43 +0000 (15:32 +0400)]
fixed ocl::merge in case of 2 and types CV_32S and CV_32F

10 years agoMerge pull request #1410 from SpecLad:module-samples
Roman Donchenko [Mon, 9 Sep 2013 11:03:40 +0000 (15:03 +0400)]
Merge pull request #1410 from SpecLad:module-samples

10 years agoMerge pull request #1416 from asmorkalov:doc_hough_circle
Roman Donchenko [Mon, 9 Sep 2013 11:03:07 +0000 (15:03 +0400)]
Merge pull request #1416 from asmorkalov:doc_hough_circle

10 years agoLink to Hough Circle Transform sample fixed in tutorial.
Alexander Smorkalov [Mon, 9 Sep 2013 09:53:49 +0000 (13:53 +0400)]
Link to Hough Circle Transform sample fixed in tutorial.

10 years agoRemoved whitespace.
Jin Ma [Mon, 9 Sep 2013 09:00:33 +0000 (17:00 +0800)]
Removed whitespace.

10 years agoMerge pull request #1387 from vpisarev:ipp_imgwarp
Roman Donchenko [Mon, 9 Sep 2013 08:54:32 +0000 (12:54 +0400)]
Merge pull request #1387 from vpisarev:ipp_imgwarp

10 years agoMerge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
Roman Donchenko [Mon, 9 Sep 2013 08:39:12 +0000 (12:39 +0400)]
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp

10 years agoAdded Kalman Filter of OpenCL version.
Jin Ma [Mon, 9 Sep 2013 08:08:23 +0000 (16:08 +0800)]
Added Kalman Filter of OpenCL version.

10 years agoMerge pull request #1409 from SpecLad:imgproc-test-memerr
Roman Donchenko [Mon, 9 Sep 2013 08:03:58 +0000 (12:03 +0400)]
Merge pull request #1409 from SpecLad:imgproc-test-memerr

10 years agoadded missing gpu::matchTemplate implementation for non-CUDA build
Vladislav Vinogradov [Mon, 9 Sep 2013 06:51:44 +0000 (10:51 +0400)]
added missing gpu::matchTemplate implementation for non-CUDA build

10 years agoRemoved unnecessary process for conversion to 4-channel format.
Jin Ma [Sat, 7 Sep 2013 02:40:30 +0000 (10:40 +0800)]
Removed unnecessary process for conversion to 4-channel format.

10 years agoMerge pull request #1407 from ilya-lavrenov:ocl_test_mog
Roman Donchenko [Fri, 6 Sep 2013 12:58:21 +0000 (16:58 +0400)]
Merge pull request #1407 from ilya-lavrenov:ocl_test_mog

10 years agoMerge pull request #1406 from SpecLad:gpu-resize-warn
Roman Donchenko [Fri, 6 Sep 2013 12:55:44 +0000 (16:55 +0400)]
Merge pull request #1406 from SpecLad:gpu-resize-warn

10 years agoFixed a memory access error in CV_Remap_Test::generate_test_data.
Roman Donchenko [Fri, 6 Sep 2013 12:02:41 +0000 (16:02 +0400)]
Fixed a memory access error in CV_Remap_Test::generate_test_data.

begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.

10 years agoFixed a few tests that use uninitialized inputs.
Roman Donchenko [Fri, 6 Sep 2013 11:53:42 +0000 (15:53 +0400)]
Fixed a few tests that use uninitialized inputs.

10 years agofixed data path
ilya-lavrenov [Fri, 6 Sep 2013 09:25:56 +0000 (13:25 +0400)]
fixed data path

10 years agoGPU resize: removed a few parameter names to avoid unused parameter warnings.
Roman Donchenko [Fri, 6 Sep 2013 08:46:58 +0000 (12:46 +0400)]
GPU resize: removed a few parameter names to avoid unused parameter warnings.

10 years agoMerge pull request #1402 from SpecLad:ocl-samples
Roman Donchenko [Fri, 6 Sep 2013 08:20:03 +0000 (12:20 +0400)]
Merge pull request #1402 from SpecLad:ocl-samples

10 years agoMerge pull request #1404 from ilya-lavrenov:stdcall
Roman Donchenko [Fri, 6 Sep 2013 08:09:59 +0000 (12:09 +0400)]
Merge pull request #1404 from ilya-lavrenov:stdcall

10 years agoRevised performance test according to the feedback of the community.
Jin Ma [Fri, 6 Sep 2013 05:39:41 +0000 (13:39 +0800)]
Revised performance test according to the feedback of the community.

10 years agoreplaced explicit __stdcall by CV_STDCALL
Ilya Lavrenov [Thu, 5 Sep 2013 15:25:03 +0000 (19:25 +0400)]
replaced explicit __stdcall by CV_STDCALL

10 years agoMOG&MOG2: Modified the performance test according to the feedback of the community.
Jin Ma [Thu, 5 Sep 2013 11:33:27 +0000 (19:33 +0800)]
MOG&MOG2: Modified the performance test according to the feedback of the community.

10 years agoMerge pull request #1400 from ilya-lavrenov:ocl_test_mog
Roman Donchenko [Thu, 5 Sep 2013 07:58:50 +0000 (11:58 +0400)]
Merge pull request #1400 from ilya-lavrenov:ocl_test_mog

10 years agoMerge pull request #1398 from ilya-lavrenov:ocl_perf_gemm
Roman Donchenko [Thu, 5 Sep 2013 07:56:22 +0000 (11:56 +0400)]
Merge pull request #1398 from ilya-lavrenov:ocl_perf_gemm

10 years agoenabled gemm and dft erf test
ilya-lavrenov [Wed, 4 Sep 2013 07:55:00 +0000 (11:55 +0400)]
enabled gemm and dft erf test

10 years agoFixed OCL samples' install path being inconsistent with the other samples.
Roman Donchenko [Wed, 4 Sep 2013 14:52:03 +0000 (18:52 +0400)]
Fixed OCL samples' install path being inconsistent with the other samples.

10 years agochanged data path and eps
ilya-lavrenov [Wed, 4 Sep 2013 08:44:52 +0000 (12:44 +0400)]
changed data path and eps

10 years agoAdded the ability to have samples inside a module.
Roman Donchenko [Wed, 4 Sep 2013 14:41:19 +0000 (18:41 +0400)]
Added the ability to have samples inside a module.

10 years agoDelete a bunch more trailing whitespace that slipped through the cracks.
Roman Donchenko [Wed, 4 Sep 2013 12:13:27 +0000 (16:13 +0400)]
Delete a bunch more trailing whitespace that slipped through the cracks.

10 years agoMerge pull request #1392 from SpecLad:flann-uninit
Roman Donchenko [Wed, 4 Sep 2013 11:49:14 +0000 (15:49 +0400)]
Merge pull request #1392 from SpecLad:flann-uninit

10 years agoMerge pull request #1397 from ilya-lavrenov:gitignore
Roman Donchenko [Wed, 4 Sep 2013 10:16:37 +0000 (14:16 +0400)]
Merge pull request #1397 from ilya-lavrenov:gitignore

10 years agoFixed a bug in FLANN resulting in uninitialized accesses.
Roman Donchenko [Wed, 4 Sep 2013 10:06:34 +0000 (14:06 +0400)]
Fixed a bug in FLANN resulting in uninitialized accesses.

This is fixed upstream in mariusmuja/flann@b615f26, but that fix
would break binary compatibility, so I had to make a different one.

Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.

10 years agoupdated .gitignore
ilya-lavrenov [Wed, 4 Sep 2013 07:56:22 +0000 (11:56 +0400)]
updated .gitignore

10 years agoRemoved whitespace.
Jin Ma [Wed, 4 Sep 2013 07:00:36 +0000 (15:00 +0800)]
Removed whitespace.

10 years agoAdded the performance test for mog and mog2.
Jin Ma [Wed, 4 Sep 2013 06:37:46 +0000 (14:37 +0800)]
Added the performance test for mog and mog2.

10 years agoMerge pull request #1283 from melody-rain:new_mog_mog2
Roman Donchenko [Tue, 3 Sep 2013 14:43:02 +0000 (18:43 +0400)]
Merge pull request #1283 from melody-rain:new_mog_mog2

10 years agoMerge pull request #1388 from bitwangyaoyao:2.4_CLAHE
Roman Donchenko [Tue, 3 Sep 2013 14:30:14 +0000 (18:30 +0400)]
Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE

10 years agoMerge pull request #1378 from StevenPuttemans:bugfix_3115
Roman Donchenko [Tue, 3 Sep 2013 08:07:24 +0000 (12:07 +0400)]
Merge pull request #1378 from StevenPuttemans:bugfix_3115

10 years agoMerge pull request #1382 from nghiaho12:cascade_classifier
Roman Donchenko [Tue, 3 Sep 2013 08:05:32 +0000 (12:05 +0400)]
Merge pull request #1382 from nghiaho12:cascade_classifier