platform/upstream/opencv.git
10 years agoAdd missing limits include
Michael Pratt [Wed, 13 Nov 2013 02:40:39 +0000 (21:40 -0500)]
Add missing limits include

Without limits included, several CUDA related files fail to compile with
GCC on Ubuntu:

modules/cudaimgproc/src/hough_lines.cpp:136:9: error: ‘numeric_limits’ is not a member of ‘std’

10 years agoMerge pull request #1781 from SpecLad:merge-2.4
Roman Donchenko [Mon, 11 Nov 2013 15:15:25 +0000 (19:15 +0400)]
Merge pull request #1781 from SpecLad:merge-2.4

10 years agoAdded a citation which used to be in the gpu module in 2.4.
Roman Donchenko [Mon, 11 Nov 2013 14:00:35 +0000 (18:00 +0400)]
Added a citation which used to be in the gpu module in 2.4.

10 years agoRemoved another usage of __func__, following #1763.
Roman Donchenko [Mon, 11 Nov 2013 13:02:50 +0000 (17:02 +0400)]
Removed another usage of __func__, following #1763.

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 11 Nov 2013 12:55:36 +0000 (16:55 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp

10 years agoMerge pull request #1767 from prattmic:python3_asstring
Roman Donchenko [Mon, 11 Nov 2013 10:01:07 +0000 (14:01 +0400)]
Merge pull request #1767 from prattmic:python3_asstring

11 years agoMerge pull request #1742 from pengx17:master_ocl_retina_sample
Roman Donchenko [Fri, 8 Nov 2013 13:17:20 +0000 (17:17 +0400)]
Merge pull request #1742 from pengx17:master_ocl_retina_sample

11 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

11 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'

11 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

11 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

11 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

11 years agoSupport PyString_AsString() in Python 3 < 3.3
Michael Pratt [Fri, 8 Nov 2013 04:37:52 +0000 (23:37 -0500)]
Support PyString_AsString() in Python 3 < 3.3

In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().

In older versions of Python 3, there is no public function to provide
the same functionality.  However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().

With this patch, cv2 should compile for Python 3.[0-2].

11 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

11 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.

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

11 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

11 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)

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

11 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

11 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

11 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

11 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

11 years agoMerge pull request #1753 from abidrahmank:py_tutorials
Roman Donchenko [Wed, 6 Nov 2013 11:40:54 +0000 (15:40 +0400)]
Merge pull request #1753 from abidrahmank:py_tutorials

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

11 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

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

11 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

11 years agoMerge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix
Roman Donchenko [Wed, 6 Nov 2013 09:59:43 +0000 (13:59 +0400)]
Merge pull request #1716 from ilya-lavrenov:resize_area_sse2_fix

11 years agofixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version
Ilya Lavrenov [Wed, 30 Oct 2013 10:39:18 +0000 (14:39 +0400)]
fixed cv::resize (area fast mode) - it writes outside of array boundary in SSE2 version

11 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

11 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

11 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

11 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

11 years agoUpdate retina_ocl.cpp
Peng Xiao [Wed, 6 Nov 2013 09:00:27 +0000 (17:00 +0800)]
Update retina_ocl.cpp

11 years agoMerge pull request #1748 from SpecLad:merge-2.4
Roman Donchenko [Wed, 6 Nov 2013 08:55:04 +0000 (12:55 +0400)]
Merge pull request #1748 from SpecLad:merge-2.4

11 years agoRevert commit 994e07db0 (PR #1715), because it's irrelevant for master.
Roman Donchenko [Wed, 6 Nov 2013 08:32:03 +0000 (12:32 +0400)]
Revert commit 994e07db0 (PR #1715), because it's irrelevant for 

Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp

11 years agosmall correction in Py tutorials
abidrahmank [Wed, 6 Nov 2013 04:52:08 +0000 (10:22 +0530)]
small correction in Py tutorials

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

11 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

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

11 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

11 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

11 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

11 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

11 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

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

11 years agoRemove the explicit setting of CMP0017, partially undoing #1720.
Roman Donchenko [Tue, 5 Nov 2013 12:44:09 +0000 (16:44 +0400)]
Remove the explicit setting of CMP0017, partially undoing #1720.

In master, it's already set to NEW, since we declare the minimal CMake
version as 2.8.7, which is newer than the policy.

11 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Tue, 5 Nov 2013 12:38:23 +0000 (16:38 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp

11 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

11 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

11 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

11 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

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

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

11 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.

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

11 years agoAdd ocl retina sample.
peng xiao [Tue, 5 Nov 2013 06:48:29 +0000 (14:48 +0800)]
Add ocl retina sample.

11 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.

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

11 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

11 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.

11 years agofix crash when path has spaces
Vincent Rabaud [Fri, 1 Nov 2013 18:30:58 +0000 (19:30 +0100)]
fix crash when path has spaces
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.

11 years agoMerge pull request #1736 from alalek:ocl_fix_corner_memory_access
Andrey Pavlenko [Fri, 1 Nov 2013 14:37:34 +0000 (18:37 +0400)]
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access

11 years agoMerge pull request #1731 from perping:2.4_haar
Andrey Pavlenko [Fri, 1 Nov 2013 12:46:17 +0000 (16:46 +0400)]
Merge pull request #1731 from perping:2.4_haar

11 years agoMerge pull request #1734 from asmorkalov:android_manager_version_inc
Roman Donchenko [Fri, 1 Nov 2013 12:39:43 +0000 (16:39 +0400)]
Merge pull request #1734 from asmorkalov:android_manager_version_inc

11 years agoocl: corner*: fix memory access in kernels; change error check to relative
Alexander Alekhin [Fri, 1 Nov 2013 12:38:04 +0000 (16:38 +0400)]
ocl: corner*: fix memory access in kernels; change error check to relative

11 years agoMerge pull request #1733 from ilya-lavrenov:cv_remap
Andrey Pavlenko [Fri, 1 Nov 2013 11:53:21 +0000 (15:53 +0400)]
Merge pull request #1733 from ilya-lavrenov:cv_remap

11 years agoMerge pull request #1732 from alalek:ocl_blendLinear
Andrey Pavlenko [Fri, 1 Nov 2013 11:53:02 +0000 (15:53 +0400)]
Merge pull request #1732 from alalek:ocl_blendLinear

11 years agoOpenCV Version++. OpenCV Manager Version++.
Alexander Smorkalov [Fri, 1 Nov 2013 11:22:34 +0000 (15:22 +0400)]
OpenCV Version++. OpenCV Manager Version++.

11 years agoconsistency SSE2 and plain versions of convertMaps and remap
Ilya Lavrenov [Fri, 1 Nov 2013 10:50:41 +0000 (14:50 +0400)]
consistency SSE2 and plain versions of convertMaps and remap

11 years agoocl: fix testdata for blendLinear
Alexander Alekhin [Fri, 1 Nov 2013 10:32:12 +0000 (14:32 +0400)]
ocl: fix testdata for blendLinear

11 years agoremove whitespace.
perping [Fri, 1 Nov 2013 09:53:35 +0000 (17:53 +0800)]
remove whitespace.

11 years agoMerge pull request #1729 from ilya-lavrenov:ocl_moments
Roman Donchenko [Fri, 1 Nov 2013 07:56:49 +0000 (11:56 +0400)]
Merge pull request #1729 from ilya-lavrenov:ocl_moments

11 years agoMerge pull request #1730 from ilya-lavrenov:ocl_kern_warn
Roman Donchenko [Fri, 1 Nov 2013 07:52:09 +0000 (11:52 +0400)]
Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn

11 years agoMerge pull request #1728 from apavlenko:refactor_vcap_jni
Roman Donchenko [Fri, 1 Nov 2013 07:39:43 +0000 (11:39 +0400)]
Merge pull request #1728 from apavlenko:refactor_vcap_jni

11 years agofixed a bug of haar.
perping [Fri, 1 Nov 2013 06:07:10 +0000 (14:07 +0800)]
fixed a bug of haar.

11 years agofixed ocl::Moments test
Ilya Lavrenov [Thu, 31 Oct 2013 20:07:10 +0000 (00:07 +0400)]
fixed ocl::Moments test

11 years agofixed warnings in ocl kernels
Ilya Lavrenov [Thu, 31 Oct 2013 19:23:56 +0000 (23:23 +0400)]
fixed warnings in ocl kernels

11 years agoMerge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
Andrey Pavlenko [Thu, 31 Oct 2013 11:32:33 +0000 (15:32 +0400)]
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective

11 years agoMerge pull request #1726 from melody-rain:2.4_tvl1_ocl
Andrey Pavlenko [Thu, 31 Oct 2013 10:03:36 +0000 (14:03 +0400)]
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl

11 years agoMerge pull request #1724 from ilya-lavrenov:ocl_thresh
Andrey Pavlenko [Thu, 31 Oct 2013 09:55:03 +0000 (13:55 +0400)]
Merge pull request #1724 from ilya-lavrenov:ocl_thresh

11 years agoMerge pull request #1710 from melody-rain:2.4_moments_ocl
Andrey Pavlenko [Thu, 31 Oct 2013 09:54:45 +0000 (13:54 +0400)]
Merge pull request #1710 from melody-rain:2.4_moments_ocl

11 years agofixed ocl::warpPerspective
Ilya Lavrenov [Thu, 31 Oct 2013 08:23:57 +0000 (12:23 +0400)]
fixed ocl::warpPerspective

11 years agominor refactoring of Android VideoCapture jni code to make it similar to generated one
Andrey Pavlenko [Thu, 31 Oct 2013 08:42:12 +0000 (12:42 +0400)]
minor refactoring of Android VideoCapture jni code to make it similar to generated one

11 years agofixed a typo.
Jin Ma [Thu, 31 Oct 2013 08:25:50 +0000 (16:25 +0800)]
fixed a typo.

11 years agoremoved test for double since not all platforms support double, thus the sanity check...
Jin Ma [Thu, 31 Oct 2013 08:21:08 +0000 (16:21 +0800)]
removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms.

11 years agoResolved a bug and used ocl::multiply.
Jin Ma [Thu, 31 Oct 2013 08:09:33 +0000 (16:09 +0800)]
Resolved a bug and used ocl::multiply.

11 years agovectorized ocl::threshold for single channel images
Ilya Lavrenov [Wed, 30 Oct 2013 15:02:51 +0000 (19:02 +0400)]
vectorized ocl::threshold for single channel images

11 years agomodified the copyright info.
Jin Ma [Thu, 31 Oct 2013 00:47:59 +0000 (08:47 +0800)]
modified the copyright info.

11 years agoMerge pull request #1709 from ilya-lavrenov:ocl_cornerharris
Andrey Pavlenko [Wed, 30 Oct 2013 20:22:37 +0000 (00:22 +0400)]
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris

11 years agoMerge pull request #1723 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Wed, 30 Oct 2013 20:21:28 +0000 (00:21 +0400)]
Merge pull request #1723 from ilya-lavrenov:ocl_norm

11 years agoMerge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel
Andrey Pavlenko [Wed, 30 Oct 2013 20:21:09 +0000 (00:21 +0400)]
Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel

11 years agoMerge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur
Andrey Pavlenko [Wed, 30 Oct 2013 20:20:51 +0000 (00:20 +0400)]
Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur

11 years agoMerge pull request #1717 from alalek:ocl_adjust_worksize
Andrey Pavlenko [Wed, 30 Oct 2013 20:20:34 +0000 (00:20 +0400)]
Merge pull request #1717 from alalek:ocl_adjust_worksize

11 years agoMerge pull request #1715 from asmorkalov:android_java_bincompat_fix
Andrey Pavlenko [Wed, 30 Oct 2013 20:04:03 +0000 (00:04 +0400)]
Merge pull request #1715 from asmorkalov:android_java_bincompat_fix

11 years agoMerge pull request #1720 from SpecLad:cmp0017
Roman Donchenko [Wed, 30 Oct 2013 13:46:33 +0000 (17:46 +0400)]
Merge pull request #1720 from SpecLad:cmp0017

11 years agoMerge pull request #1718 from SpecLad:have-opencv-ocl
Roman Donchenko [Wed, 30 Oct 2013 13:33:03 +0000 (17:33 +0400)]
Merge pull request #1718 from SpecLad:have-opencv-ocl

11 years agodisabled upload and download perf tests
Ilya Lavrenov [Wed, 30 Oct 2013 13:08:57 +0000 (17:08 +0400)]
disabled upload and download perf tests

11 years agofixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
Ilya Lavrenov [Wed, 30 Oct 2013 12:48:12 +0000 (16:48 +0400)]
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0