platform/upstream/opencv.git
10 years agogeneralized ocl::resize for all data types (INTER_NEAREST mode)
Ilya Lavrenov [Fri, 15 Nov 2013 09:48:14 +0000 (13:48 +0400)]
generalized ocl::resize for all data types (INTER_NEAREST mode)

10 years agoMerge pull request #1799 from SpecLad:avformat-53-6
Roman Donchenko [Fri, 15 Nov 2013 07:51:59 +0000 (11:51 +0400)]
Merge pull request #1799 from SpecLad:avformat-53-6

10 years agoFix building with FFmpeg 0.8.
Roman Donchenko [Thu, 14 Nov 2013 13:25:46 +0000 (17:25 +0400)]
Fix building with FFmpeg 0.8.

avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.

In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.

10 years agoMerge pull request #1794 from vrabaud:2.4
Roman Donchenko [Thu, 14 Nov 2013 12:43:50 +0000 (16:43 +0400)]
Merge pull request #1794 from vrabaud:2.4

10 years agoMerge pull request #1796 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Thu, 14 Nov 2013 10:46:42 +0000 (14:46 +0400)]
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor

10 years agoMerge pull request #1792 from ilya-lavrenov:ocl_warp_eps
Roman Donchenko [Thu, 14 Nov 2013 10:46:06 +0000 (14:46 +0400)]
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps

10 years agoMerge pull request #1790 from ilya-lavrenov:ocl_ref
Roman Donchenko [Thu, 14 Nov 2013 10:45:50 +0000 (14:45 +0400)]
Merge pull request #1790 from ilya-lavrenov:ocl_ref

10 years agocleaner fix
Vincent Rabaud [Thu, 14 Nov 2013 10:45:42 +0000 (11:45 +0100)]
cleaner fix

10 years agoadded HLS -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 15:35:24 +0000 (19:35 +0400)]
added HLS -> RGB[A][FULL] conversion

10 years agoadded HSV -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 15:08:37 +0000 (19:08 +0400)]
added HSV -> RGB[A][FULL] conversion

10 years agoadded RGB[A] -> HLS[FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 13:41:40 +0000 (17:41 +0400)]
added RGB[A] -> HLS[FULL] conversion

10 years agoMerge pull request #1788 from alalek:perf_test_skip
Roman Donchenko [Wed, 13 Nov 2013 13:21:52 +0000 (17:21 +0400)]
Merge pull request #1788 from alalek:perf_test_skip

10 years agoreturn when OpenCV is found
Vincent Rabaud [Wed, 13 Nov 2013 13:20:09 +0000 (14:20 +0100)]
return when OpenCV is found

10 years agoadded RGB[A] -> HSV[FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 13:09:05 +0000 (17:09 +0400)]
added RGB[A] -> HSV[FULL] conversion

10 years agoMerge pull request #1786 from SpecLad:cap-images-file-pattern
Roman Donchenko [Wed, 13 Nov 2013 13:00:20 +0000 (17:00 +0400)]
Merge pull request #1786 from SpecLad:cap-images-file-pattern

10 years agoMerge pull request #1779 from perping:integral_2.4
Roman Donchenko [Wed, 13 Nov 2013 11:53:42 +0000 (15:53 +0400)]
Merge pull request #1779 from perping:integral_2.4

10 years agoMerge pull request #1784 from SpecLad:ffmpeg-no-png
Roman Donchenko [Wed, 13 Nov 2013 11:52:42 +0000 (15:52 +0400)]
Merge pull request #1784 from SpecLad:ffmpeg-no-png

10 years agofixes http://code.opencv.org/issues/3367
Vincent Rabaud [Wed, 13 Nov 2013 11:25:44 +0000 (12:25 +0100)]
fixes http://code.opencv.org/issues/3367

10 years agoocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
Alexander Alekhin [Tue, 12 Nov 2013 14:59:43 +0000 (18:59 +0400)]
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

10 years agoperf tests: allow to skip performance tests
Alexander Alekhin [Tue, 12 Nov 2013 14:15:50 +0000 (18:15 +0400)]
perf tests: allow to skip performance tests

10 years agorefactored some functions from ocl arithm
Ilya Lavrenov [Tue, 12 Nov 2013 12:50:42 +0000 (16:50 +0400)]
refactored some functions from ocl arithm

10 years agoadded eps to ocl::buildWarpPerspectiveMaps perf test
Ilya Lavrenov [Wed, 13 Nov 2013 09:04:02 +0000 (13:04 +0400)]
added eps to ocl::buildWarpPerspectiveMaps perf test

10 years agoMerge pull request #1785 from ilya-lavrenov:ocl_kern_warn
Roman Donchenko [Wed, 13 Nov 2013 08:20:08 +0000 (12:20 +0400)]
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn

10 years agoMerge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc
Roman Donchenko [Wed, 13 Nov 2013 08:16:01 +0000 (12:16 +0400)]
Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc

10 years agofix haar
perping [Wed, 13 Nov 2013 02:19:09 +0000 (10:19 +0800)]
fix haar

10 years agofix match_template and haar
perping [Wed, 13 Nov 2013 02:09:39 +0000 (10:09 +0800)]
fix match_template and haar

10 years agofixed compilation of ocl::minMaxLoc for Intel device
Ilya Lavrenov [Tue, 12 Nov 2013 15:14:40 +0000 (19:14 +0400)]
fixed compilation of ocl::minMaxLoc for Intel device

10 years agoIn the image sequence capture, only search for the ordinal in the file name.
Roman Donchenko [Tue, 12 Nov 2013 12:15:41 +0000 (16:15 +0400)]
In the image sequence capture, only search for the ordinal in the file name.

Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.

If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.

10 years agokernel warnings on AMD
Ilya Lavrenov [Mon, 11 Nov 2013 16:08:40 +0000 (20:08 +0400)]
kernel warnings on AMD

10 years agoMerge pull request #1775 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Tue, 12 Nov 2013 10:26:50 +0000 (14:26 +0400)]
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor

10 years agofix linux warning.
perping [Tue, 12 Nov 2013 10:13:44 +0000 (18:13 +0800)]
fix linux warning.

10 years agofix haar
perping [Tue, 12 Nov 2013 09:54:03 +0000 (17:54 +0800)]
fix haar

10 years agoMerge pull request #1782 from ilya-lavrenov:ocl_adapBilat
Roman Donchenko [Tue, 12 Nov 2013 08:53:33 +0000 (12:53 +0400)]
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat

10 years agoMerge pull request #1766 from ilya-lavrenov:ocl_remap_linear
Roman Donchenko [Tue, 12 Nov 2013 08:40:13 +0000 (12:40 +0400)]
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear

10 years agoMerge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
Roman Donchenko [Tue, 12 Nov 2013 08:26:37 +0000 (12:26 +0400)]
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps

10 years agoMerge pull request #1783 from SpecLad:cap-no-pattern
Roman Donchenko [Tue, 12 Nov 2013 07:52:49 +0000 (11:52 +0400)]
Merge pull request #1783 from SpecLad:cap-no-pattern

10 years agofix some bug about haar and match_template.
perping [Tue, 12 Nov 2013 05:56:47 +0000 (13:56 +0800)]
fix some bug about haar and match_template.

10 years agoadded RGB5x5 <-> Gray
Ilya Lavrenov [Mon, 11 Nov 2013 12:30:23 +0000 (16:30 +0400)]
added RGB5x5 <-> Gray

10 years agoReplaced the image used in the Highgui_Video.ffmpeg_image test.
Roman Donchenko [Mon, 11 Nov 2013 14:30:04 +0000 (18:30 +0400)]
Replaced the image used in the Highgui_Video.ffmpeg_image test.

Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.

When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.

10 years agoremoved 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter
Ilya Lavrenov [Mon, 11 Nov 2013 13:53:21 +0000 (17:53 +0400)]
removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter

10 years agoFixed the "image sequence" capture not failing when a pattern isn't found.
Roman Donchenko [Mon, 11 Nov 2013 14:02:56 +0000 (18:02 +0400)]
Fixed the "image sequence" capture not failing when a pattern isn't found.

at can't be a null pointer, so the condition was always false, and
a nonsensical pattern like "image.png%00d" was being inferred.

10 years agoadded a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate...
Ilya Lavrenov [Fri, 8 Nov 2013 14:43:15 +0000 (18:43 +0400)]
added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file

10 years agoMerge pull request #1780 from ilya-lavrenov:ocl_m_pi
Roman Donchenko [Mon, 11 Nov 2013 13:00:31 +0000 (17:00 +0400)]
Merge pull request #1780 from ilya-lavrenov:ocl_m_pi

10 years agoadded RGB5x5 <-> RGB conversion
Ilya Lavrenov [Mon, 11 Nov 2013 09:04:55 +0000 (13:04 +0400)]
added RGB5x5 <-> RGB conversion

10 years agofix warning.
perping [Mon, 11 Nov 2013 07:06:58 +0000 (15:06 +0800)]
fix warning.

10 years agoMake Integral sum support cv_32f, sqsum support cv_64f.
perping [Mon, 11 Nov 2013 06:31:02 +0000 (14:31 +0800)]
Make Integral sum support cv_32f, sqsum support cv_64f.

10 years agoreplaced custom PI by OpenCL M_PI constant
Ilya Lavrenov [Sun, 10 Nov 2013 20:53:26 +0000 (00:53 +0400)]
replaced custom PI by OpenCL M_PI constant

10 years agoadded RGB[A] <-> BGR[A] conversion to ocl::cvtColor
Ilya Lavrenov [Sun, 10 Nov 2013 16:56:18 +0000 (20:56 +0400)]
added RGB[A] <-> BGR[A] conversion to ocl::cvtColor

10 years agoadded XYZ to RGB conversion to ocl::cvtColor
Ilya Lavrenov [Sun, 10 Nov 2013 10:30:37 +0000 (14:30 +0400)]
added XYZ to RGB conversion to ocl::cvtColor

10 years agoadded RGB -> XYZ conversion to ocl::cvtColor
Ilya Lavrenov [Sun, 10 Nov 2013 09:38:09 +0000 (13:38 +0400)]
added RGB -> XYZ conversion to ocl::cvtColor

10 years agocolor.cpp refactoring: created generic interface for toRGB and fromRGB callers
Ilya Lavrenov [Sat, 9 Nov 2013 15:14:38 +0000 (19:14 +0400)]
color.cpp refactoring: created generic interface for toRGB and fromRGB callers

10 years agoadded YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor
Ilya Lavrenov [Sat, 9 Nov 2013 13:03:30 +0000 (17:03 +0400)]
added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor

10 years agofixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA
Ilya Lavrenov [Fri, 8 Nov 2013 15:07:06 +0000 (19:07 +0400)]
fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA

10 years agoadded an accuracy test for ocl::buildWarpPerspectiveMaps
Ilya Lavrenov [Fri, 8 Nov 2013 14:42:13 +0000 (18:42 +0400)]
added an accuracy test for ocl::buildWarpPerspectiveMaps

10 years agoadded ROI support to ocl::buildWarp*Maps functions
Ilya Lavrenov [Fri, 8 Nov 2013 14:40:53 +0000 (18:40 +0400)]
added ROI support to ocl::buildWarp*Maps functions

10 years agoMerge pull request #1771 from kiranpradeep:2.4
Roman Donchenko [Fri, 8 Nov 2013 13:16:20 +0000 (17:16 +0400)]
Merge pull request #1771 from kiranpradeep:2.4

10 years agoCMake's get_filename_component with NAME_WE parameters, interprets first period as...
Kiran Pradeep [Fri, 8 Nov 2013 08:39:34 +0000 (14:09 +0530)]
CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file'

10 years agoMerge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters
Roman Donchenko [Fri, 8 Nov 2013 08:39:13 +0000 (12:39 +0400)]
Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters

10 years agoMerge pull request #1755 from KonstantinMatskevich:dump_info
Roman Donchenko [Fri, 8 Nov 2013 08:31:04 +0000 (12:31 +0400)]
Merge pull request #1755 from KonstantinMatskevich:dump_info

10 years agoMerge pull request #1763 from SpecLad:cv-func
Roman Donchenko [Fri, 8 Nov 2013 08:29:49 +0000 (12:29 +0400)]
Merge pull request #1763 from SpecLad:cv-func

10 years agoadded CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)
Ilya Lavrenov [Thu, 7 Nov 2013 15:50:06 +0000 (19:50 +0400)]
added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)

10 years agoMerge pull request #1760 from ilya-lavrenov:ocl_remap_nn
Roman Donchenko [Thu, 7 Nov 2013 13:29:16 +0000 (17:29 +0400)]
Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn

10 years agoEnabled CV_Assert and such to print the function name with Visual C++.
Roman Donchenko [Thu, 7 Nov 2013 13:13:30 +0000 (17:13 +0400)]
Enabled CV_Assert and such to print the function name with Visual C++.

Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.

10 years agoupdate
Konstantin Matskevich [Wed, 6 Nov 2013 12:03:58 +0000 (16:03 +0400)]
update

10 years agoMerge pull request #1737 from vrabaud:2.4
Roman Donchenko [Thu, 7 Nov 2013 08:03:29 +0000 (12:03 +0400)]
Merge pull request #1737 from vrabaud:2.4

10 years agoadded CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)
Ilya Lavrenov [Mon, 4 Nov 2013 16:50:33 +0000 (20:50 +0400)]
added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)

10 years agospeeded up ocl::distanceToCenters
Ilya Lavrenov [Tue, 5 Nov 2013 16:03:49 +0000 (20:03 +0400)]
speeded up ocl::distanceToCenters

10 years agoMerge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer
Andrey Pavlenko [Wed, 6 Nov 2013 14:26:39 +0000 (18:26 +0400)]
Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer

10 years agoMerge pull request #1758 from apavlenko:adaptive_bilateral_filter
Andrey Pavlenko [Wed, 6 Nov 2013 14:09:48 +0000 (18:09 +0400)]
Merge pull request #1758 from apavlenko:adaptive_bilateral_filter

10 years agoMerge pull request #1757 from asmorkalov:android_manager_version_inc2
Roman Donchenko [Wed, 6 Nov 2013 13:50:19 +0000 (17:50 +0400)]
Merge pull request #1757 from asmorkalov:android_manager_version_inc2

10 years agoCleaned up adaptive bilateral filtering, added support for gaussian interpolation...
Harris Gasparakis [Tue, 5 Nov 2013 12:04:04 +0000 (07:04 -0500)]
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs

10 years agoextending openCL info dump
Konstantin Matskevich [Wed, 6 Nov 2013 08:17:06 +0000 (12:17 +0400)]
extending openCL info dump

10 years agoMerge pull request #1711 from SpecLad:cap-broken-mat
Roman Donchenko [Wed, 6 Nov 2013 10:53:07 +0000 (14:53 +0400)]
Merge pull request #1711 from SpecLad:cap-broken-mat

10 years agoAndroid Manager Version++.
Alexander Smorkalov [Wed, 6 Nov 2013 10:24:18 +0000 (14:24 +0400)]
Android Manager Version++.

10 years agoocl: workaround for subbuffer memory leaks
Alexander Alekhin [Wed, 6 Nov 2013 09:20:02 +0000 (13:20 +0400)]
ocl: workaround for subbuffer memory leaks

10 years agoMerge pull request #1750 from alalek:ocl_update_documentation
Andrey Pavlenko [Wed, 6 Nov 2013 09:32:00 +0000 (13:32 +0400)]
Merge pull request #1750 from alalek:ocl_update_documentation

10 years agoMerge pull request #1740 from ilya-lavrenov:ocl_corners
Andrey Pavlenko [Wed, 6 Nov 2013 09:31:43 +0000 (13:31 +0400)]
Merge pull request #1740 from ilya-lavrenov:ocl_corners

10 years agoMerge pull request #1739 from pengx17:2.4_ocl_overload_haar
Andrey Pavlenko [Wed, 6 Nov 2013 09:31:11 +0000 (13:31 +0400)]
Merge pull request #1739 from pengx17:2.4_ocl_overload_haar

10 years agoMerge pull request #1743 from ilya-lavrenov:ocl_repeat
Roman Donchenko [Wed, 6 Nov 2013 09:24:22 +0000 (13:24 +0400)]
Merge pull request #1743 from ilya-lavrenov:ocl_repeat

10 years agoRevert back test image.
peng xiao [Wed, 6 Nov 2013 03:19:26 +0000 (11:19 +0800)]
Revert back test image.

10 years agoocl: update comments in ocl.hpp
Alexander Alekhin [Thu, 31 Oct 2013 11:05:00 +0000 (15:05 +0400)]
ocl: update comments in ocl.hpp

10 years agoocl: update documentation
Alexander Alekhin [Wed, 30 Oct 2013 14:22:18 +0000 (18:22 +0400)]
ocl: update documentation

10 years agoMerge pull request #1752 from alalek:ocl_memory_cleanup_workaround
Andrey Pavlenko [Tue, 5 Nov 2013 19:49:36 +0000 (23:49 +0400)]
Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround

10 years agoMerge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
Andrey Pavlenko [Tue, 5 Nov 2013 19:49:11 +0000 (23:49 +0400)]
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix

10 years agoMerge pull request #1745 from alalek:ocl_fix_svm_with_blas
Andrey Pavlenko [Tue, 5 Nov 2013 19:48:41 +0000 (23:48 +0400)]
Merge pull request #1745 from alalek:ocl_fix_svm_with_blas

10 years agoocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory...
Alexander Alekhin [Thu, 31 Oct 2013 19:00:43 +0000 (23:00 +0400)]
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard

10 years agoMerge pull request #1749 from SpecLad:update-ignore
Roman Donchenko [Tue, 5 Nov 2013 15:41:28 +0000 (19:41 +0400)]
Merge pull request #1749 from SpecLad:update-ignore

10 years agofixed ocl::copyMakeBorder accuracy test
Ilya Lavrenov [Fri, 1 Nov 2013 15:06:42 +0000 (19:06 +0400)]
fixed ocl::copyMakeBorder accuracy test

10 years agoocl: svm: restore non BLAS version
Alexander Alekhin [Tue, 5 Nov 2013 11:15:26 +0000 (15:15 +0400)]
ocl: svm: restore non BLAS version

10 years agoRevert "disable SVM when AMD BLAS is not available"
Alexander Alekhin [Tue, 5 Nov 2013 11:13:30 +0000 (15:13 +0400)]
Revert "disable SVM when AMD BLAS is not available"

This reverts commit d63a38e9bfad4081ec8107e8d38e03c03f6548d2.

Conflicts:
modules/ocl/test/test_ml.cpp

10 years agoadd VERBATIM as advised by @SpecLad
Vincent Rabaud [Tue, 5 Nov 2013 11:02:22 +0000 (12:02 +0100)]
add VERBATIM as advised by @SpecLad

10 years agofix the crash as suggested by @SpecLad
Vincent Rabaud [Tue, 5 Nov 2013 10:18:20 +0000 (11:18 +0100)]
fix the crash as suggested by @SpecLad

10 years agocame back to relative error
Ilya Lavrenov [Tue, 5 Nov 2013 10:17:31 +0000 (14:17 +0400)]
came back to relative error

10 years agoSorted .gitignore.
Roman Donchenko [Tue, 5 Nov 2013 09:41:42 +0000 (13:41 +0400)]
Sorted .gitignore.

10 years agoUpdate .gitignore.
Roman Donchenko [Tue, 5 Nov 2013 09:37:01 +0000 (13:37 +0400)]
Update .gitignore.

* OpenCV4Tegra/ is no longer relevant.
* We should only ignore the particular refman.rst that we generate.

10 years agoadded ocl::repeat
Ilya Lavrenov [Mon, 4 Nov 2013 19:59:56 +0000 (23:59 +0400)]
added ocl::repeat

10 years agoLet perf/accuracy test of ocl haar uses detectMultiScale api.
peng xiao [Tue, 5 Nov 2013 02:40:27 +0000 (10:40 +0800)]
Let perf/accuracy test of ocl haar uses detectMultiScale api.
Fix image to be used by perf test.

10 years agofixed warnings in OpenCL kernels
Ilya Lavrenov [Mon, 4 Nov 2013 11:30:00 +0000 (15:30 +0400)]
fixed warnings in OpenCL kernels

10 years agofixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests
Ilya Lavrenov [Mon, 4 Nov 2013 11:09:58 +0000 (15:09 +0400)]
fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests

10 years agoOverload detectMultiScale API for ocl::haar.
peng xiao [Mon, 4 Nov 2013 06:59:28 +0000 (14:59 +0800)]
Overload detectMultiScale API for ocl::haar.