platform/upstream/opencv.git
7 years agomorph ocl kernel for erode and dilate filter
Li Peng [Wed, 19 Oct 2016 06:53:05 +0000 (14:53 +0800)]
morph ocl kernel for erode and dilate filter

This kernel is for CV_8UC1 format and 3x3 kernel size,
It is about 33% ~ 55% faster than current ocl kernel with below perf test

python ./modules/ts/misc/run.py -t imgproc --gtest_filter=OCL_ErodeFixture*
python ./modules/ts/misc/run.py -t imgproc --gtest_filter=OCL_DilateFixture*

Also add accuracy test cases for this kernel, the test command is

./bin/opencv_test_imgproc --gtest_filter=OCL_Filter/MorphFilter3x3*

Signed-off-by: Li Peng <peng.li@intel.com>
7 years agoMerge pull request #7496 from abratchik:java.wrapper.fix.3.1
Alexander Alekhin [Sun, 16 Oct 2016 16:49:33 +0000 (16:49 +0000)]
Merge pull request #7496 from abratchik:java.wrapper.fix.3.1

7 years agoMerge pull request #7472 from ArkadiuszRaj:aravis-autoexposure
Arek [Sun, 16 Oct 2016 16:14:58 +0000 (18:14 +0200)]
Merge pull request #7472 from ArkadiuszRaj:aravis-autoexposure

Aravis SDK: Basic software based autoexposure control

* Basic software based autoexposure control

* Aravis autoexposure: skip frame taken while changing exposure setup

7 years agoadd vector_vector_KeyPoint support to python wrappers
abratchik [Sun, 16 Oct 2016 15:09:35 +0000 (19:09 +0400)]
add vector_vector_KeyPoint support to python wrappers

7 years agofix regression issues in Feature2D and DescriptorMatcher interfaces
abratchik [Sun, 16 Oct 2016 09:33:12 +0000 (13:33 +0400)]
fix regression issues in Feature2D and DescriptorMatcher interfaces

7 years agoMerge pull request #7476 from abratchik:java.wrapper.fix.3.1
Alexander Alekhin [Sat, 15 Oct 2016 09:21:45 +0000 (09:21 +0000)]
Merge pull request #7476 from abratchik:java.wrapper.fix.3.1

7 years agoMerge pull request #7487 from StevenPuttemans:add_compute_capabilities
Alexander Alekhin [Sat, 15 Oct 2016 09:19:22 +0000 (09:19 +0000)]
Merge pull request #7487 from StevenPuttemans:add_compute_capabilities

7 years agoMerge pull request #7490 from alalek:ios_disable_ippicv
Alexander Alekhin [Sat, 15 Oct 2016 09:18:14 +0000 (09:18 +0000)]
Merge pull request #7490 from alalek:ios_disable_ippicv

7 years agofix for VideoCapture crash
abratchik [Fri, 14 Oct 2016 15:21:17 +0000 (19:21 +0400)]
fix for VideoCapture crash

7 years agoios: disable IPPICV on i386-iPhoneSimulator
Alexander Alekhin [Fri, 14 Oct 2016 23:40:06 +0000 (02:40 +0300)]
ios: disable IPPICV on i386-iPhoneSimulator

7 years agoMerge pull request #7483 from paroj:addtext
Alexander Alekhin [Fri, 14 Oct 2016 14:06:50 +0000 (14:06 +0000)]
Merge pull request #7483 from paroj:addtext

7 years agofix BGR <> RGB swap
Pavel Rojtberg [Thu, 13 Oct 2016 16:26:02 +0000 (18:26 +0200)]
fix BGR <> RGB swap

we are drawing on a BGR image declared as RGB, so we should not swap
components here either.

7 years agohighgui: allow wrapping cv::addText
Pavel Rojtberg [Thu, 13 Oct 2016 16:05:48 +0000 (18:05 +0200)]
highgui: allow wrapping cv::addText

also correctly forward spacing parameter in fontQt

7 years agoMerge pull request #7367 from terfendail:ovxhal_imgprocfix
Maksim Shabunin [Fri, 14 Oct 2016 09:49:28 +0000 (09:49 +0000)]
Merge pull request #7367 from terfendail:ovxhal_imgprocfix

7 years agoadd 5.2 and 6.1 compute capability support
StevenPuttemans [Fri, 14 Oct 2016 08:14:12 +0000 (10:14 +0200)]
add 5.2 and 6.1 compute capability support

7 years agoMerge pull request #7468 from StevenPuttemans:fix_single_scale_detection
Alexander Alekhin [Thu, 13 Oct 2016 16:19:17 +0000 (16:19 +0000)]
Merge pull request #7468 from StevenPuttemans:fix_single_scale_detection

7 years agoMerge pull request #7471 from alalek:fix_java_generator
Maksim Shabunin [Thu, 13 Oct 2016 15:21:39 +0000 (15:21 +0000)]
Merge pull request #7471 from alalek:fix_java_generator

7 years agoMerge pull request #7457 from alalek:cmake_fix_ios
Maksim Shabunin [Thu, 13 Oct 2016 14:59:36 +0000 (14:59 +0000)]
Merge pull request #7457 from alalek:cmake_fix_ios

7 years agoallow minObjectSize==maxObjectSize for single scale detection capability
StevenPuttemans [Wed, 12 Oct 2016 11:59:45 +0000 (13:59 +0200)]
allow minObjectSize==maxObjectSize for single scale detection capability

7 years agofix for legacy FeatureDetector and DescriptorMatcher classes
abratchik [Thu, 13 Oct 2016 09:43:55 +0000 (13:43 +0400)]
fix for legacy FeatureDetector and DescriptorMatcher classes

7 years agocmake: update configuration for iOS
Alexander Alekhin [Tue, 11 Oct 2016 11:37:53 +0000 (14:37 +0300)]
cmake: update configuration for iOS

7 years agoMerge pull request #7432 from abratchik:java.wrapper.fix.3.1
Vadim Pisarevsky [Wed, 12 Oct 2016 19:54:03 +0000 (19:54 +0000)]
Merge pull request #7432 from abratchik:java.wrapper.fix.3.1

7 years agoMerge pull request #7428 from alalek:cmake_fix_compiler_flags_detection
Vadim Pisarevsky [Wed, 12 Oct 2016 19:38:25 +0000 (19:38 +0000)]
Merge pull request #7428 from alalek:cmake_fix_compiler_flags_detection

7 years agojava: integrate code from base modules
Alexander Alekhin [Wed, 12 Oct 2016 14:28:50 +0000 (17:28 +0300)]
java: integrate code from base modules

To resolve undefined "Mat_to_vector_KeyPoint" error

7 years agoMerge pull request #7413 from tomoaki0705:featureUniversalThreshold
Alexander Alekhin [Wed, 12 Oct 2016 10:01:36 +0000 (10:01 +0000)]
Merge pull request #7413 from tomoaki0705:featureUniversalThreshold

7 years agoMerge pull request #7455 from tomoaki0705:featureUniversalLkPyramid
Alexander Alekhin [Wed, 12 Oct 2016 09:57:52 +0000 (09:57 +0000)]
Merge pull request #7455 from tomoaki0705:featureUniversalLkPyramid

7 years agoMerge pull request #7431 from ArkadiuszRaj:pgm-16bit
Alexander Alekhin [Wed, 12 Oct 2016 09:52:04 +0000 (09:52 +0000)]
Merge pull request #7431 from ArkadiuszRaj:pgm-16bit

7 years agoMerge pull request #7466 from Trojahn:master
Alexander Alekhin [Wed, 12 Oct 2016 07:58:37 +0000 (07:58 +0000)]
Merge pull request #7466 from Trojahn:master

7 years agoMerge pull request #7451 from reunanen:issue-7409
Juha Reunanen [Wed, 12 Oct 2016 07:34:51 +0000 (10:34 +0300)]
Merge pull request #7451 from reunanen:issue-7409

Fix findContours crash for very large images (#7451)

* Cast step to size_t in order to avoid integer overflow when processing very large images

* Change assert to CV_Assert

7 years agoMerge pull request #7442 from catree:morphology_additional_information
Alexander Alekhin [Wed, 12 Oct 2016 07:31:21 +0000 (07:31 +0000)]
Merge pull request #7442 from catree:morphology_additional_information

7 years agoMerge pull request #7441 from catree:add_distortion_images
Alexander Alekhin [Wed, 12 Oct 2016 07:30:52 +0000 (07:30 +0000)]
Merge pull request #7441 from catree:add_distortion_images

7 years agoBugfix #7438
viodetools [Tue, 11 Oct 2016 22:42:50 +0000 (19:42 -0300)]
Bugfix #7438

7 years agouse universal intrinsic implementation for calcSharrDeriv
Tomoaki Teshima [Tue, 11 Oct 2016 11:22:23 +0000 (20:22 +0900)]
use universal intrinsic implementation for calcSharrDeriv

7 years agouse universal intrinsic in threshold
Tomoaki Teshima [Mon, 3 Oct 2016 23:42:02 +0000 (08:42 +0900)]
use universal intrinsic in threshold
  * add performance test for 32F and 64F threshold
  * requires update of opencv_extra

7 years agoimproved fix for java wrapper generator (gen_java.py) to avoid generation of java...
abratchik [Fri, 7 Oct 2016 22:13:01 +0000 (02:13 +0400)]
improved fix for java wrapper generator (gen_java.py) to avoid generation of java methods with duplicate signatures(v3)

7 years agoMerge pull request #7447 from alalek:ocl_fix_svm
Alexander Alekhin [Mon, 10 Oct 2016 20:55:08 +0000 (20:55 +0000)]
Merge pull request #7447 from alalek:ocl_fix_svm

7 years agoMerge pull request #7430 from ArkadiuszRaj:aravis
Alexander Alekhin [Mon, 10 Oct 2016 20:54:14 +0000 (20:54 +0000)]
Merge pull request #7430 from ArkadiuszRaj:aravis

7 years agoocl: fix SVM code
Alexander Alekhin [Mon, 10 Oct 2016 17:52:30 +0000 (20:52 +0300)]
ocl: fix SVM code

7 years agoMerge pull request #7440 from mschoeneck:Prefer_OCL_befor_IPP_for_Sobel_and_Scharr
Alexander Alekhin [Mon, 10 Oct 2016 10:45:27 +0000 (10:45 +0000)]
Merge pull request #7440 from mschoeneck:Prefer_OCL_befor_IPP_for_Sobel_and_Scharr

7 years agoMerge pull request #7416 from StevenPuttemans:add_comment_medianBlur
Alexander Alekhin [Mon, 10 Oct 2016 10:43:04 +0000 (10:43 +0000)]
Merge pull request #7416 from StevenPuttemans:add_comment_medianBlur

7 years agoadd border replicate note
StevenPuttemans [Thu, 6 Oct 2016 13:59:16 +0000 (15:59 +0200)]
add border replicate note

7 years agoTry to clarify the morphological operations in the tutorial to avoid possible confusions.
catree [Sun, 9 Oct 2016 21:45:04 +0000 (23:45 +0200)]
Try to clarify the morphological operations in the tutorial to avoid possible confusions.

7 years agoChenge arv_camera_abort_acquisition to arv_camera_stop_acquisition
ArkadiuszRaj [Sun, 9 Oct 2016 18:40:00 +0000 (20:40 +0200)]
Chenge arv_camera_abort_acquisition to arv_camera_stop_acquisition

7 years agoAdd distortion example images for calib3d documentation.
catree [Sun, 9 Oct 2016 18:35:58 +0000 (20:35 +0200)]
Add distortion example images for calib3d documentation.

7 years agofourcc support, improved buffer handling, check if exposure, gain & fps properties...
ArkadiuszRaj [Sun, 9 Oct 2016 14:58:30 +0000 (16:58 +0200)]
fourcc support, improved buffer handling, check if exposure, gain & fps properties are available

7 years agoAdding check for IPP if UMat and OpenCL is available in Sobel and Scharr.
matze [Sun, 9 Oct 2016 13:37:22 +0000 (15:37 +0200)]
Adding check for IPP  if UMat and OpenCL is available in Sobel and Scharr.

7 years agoSupport for MONO8 & MONO12 pixel formats
ArkadiuszRaj [Sat, 8 Oct 2016 11:01:01 +0000 (13:01 +0200)]
Support for MONO8 & MONO12 pixel formats

7 years agojava: fix Ptr<> code generation
Alexander Alekhin [Fri, 7 Oct 2016 19:29:10 +0000 (22:29 +0300)]
java: fix Ptr<> code generation

Before:
    Ptr<Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)
After:
    Ptr<cv::aruco::Dictionary>((cv::aruco::Dictionary*)dictionary_nativeObj)

7 years agoeliminate compiler warnings
Alexander Alekhin [Fri, 7 Oct 2016 15:49:52 +0000 (18:49 +0300)]
eliminate compiler warnings

7 years agocmake: fix ocv_check_compiler_flag
Alexander Alekhin [Fri, 7 Oct 2016 14:31:21 +0000 (17:31 +0300)]
cmake: fix ocv_check_compiler_flag

7 years agoMissing declaration
ArkadiuszRaj [Fri, 7 Oct 2016 20:22:46 +0000 (22:22 +0200)]
Missing declaration

7 years agofix for #7420, #7421
abratchik [Fri, 7 Oct 2016 19:58:57 +0000 (23:58 +0400)]
fix for #7420, #7421

7 years agoBasic support for GigE cameras via Aravis SDK
ArkadiuszRaj [Fri, 7 Oct 2016 19:55:49 +0000 (21:55 +0200)]
Basic support for GigE cameras via Aravis SDK

7 years agoSolution to issue #7408
ArkadiuszRaj [Fri, 7 Oct 2016 19:29:08 +0000 (21:29 +0200)]
Solution to issue #7408

7 years agoMerge pull request #7410 from pylbert:doc_DectectPython
Vadim Pisarevsky [Thu, 6 Oct 2016 13:40:33 +0000 (13:40 +0000)]
Merge pull request #7410 from pylbert:doc_DectectPython

7 years agoMerge pull request #7399 from K-Shinotsuka:issue27
Vadim Pisarevsky [Thu, 6 Oct 2016 13:31:05 +0000 (13:31 +0000)]
Merge pull request #7399 from K-Shinotsuka:issue27

7 years agoMerge pull request #7401 from K-Shinotsuka:issue28
Vadim Pisarevsky [Thu, 6 Oct 2016 13:30:30 +0000 (13:30 +0000)]
Merge pull request #7401 from K-Shinotsuka:issue28

7 years agoMerge pull request #7402 from K-Shinotsuka:issue29
Vadim Pisarevsky [Thu, 6 Oct 2016 13:29:56 +0000 (13:29 +0000)]
Merge pull request #7402 from K-Shinotsuka:issue29

7 years agoMerge pull request #7404 from K-Shinotsuka:issue30
Vadim Pisarevsky [Thu, 6 Oct 2016 13:29:00 +0000 (13:29 +0000)]
Merge pull request #7404 from K-Shinotsuka:issue30

7 years agoMerge pull request #7415 from StevenPuttemans:fix_issue_7409
Vadim Pisarevsky [Thu, 6 Oct 2016 13:25:28 +0000 (13:25 +0000)]
Merge pull request #7415 from StevenPuttemans:fix_issue_7409

7 years agofix for feature2d java wrappers as described in this post: http://ans… (#7372)
Jcrist99 [Thu, 6 Oct 2016 12:48:26 +0000 (16:48 +0400)]
fix for feature2d java wrappers as described in this post: ans… (#7372)

* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/

* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/

* rollback of one change as requested (similar change already merged)

7 years agoreplace principle by principal
StevenPuttemans [Thu, 6 Oct 2016 12:09:26 +0000 (14:09 +0200)]
replace principle by principal

7 years agodoc: Small change to documentation in DectectPython.cmake
Noel Eck [Wed, 5 Oct 2016 23:52:28 +0000 (16:52 -0700)]
doc: Small change to documentation in DectectPython.cmake

Fixed small typo for python 3 default version.

Signed-off-by: Noel Eck <noel.eck@intel.com>
7 years agoMerge pull request #6078 from PolarNick239:master
Vadim Pisarevsky [Wed, 5 Oct 2016 17:27:23 +0000 (17:27 +0000)]
Merge pull request #6078 from PolarNick239:master

7 years agonormHamming done with AVX 2 intrinsics (ver 2) (#7405)
Vadim Pisarevsky [Wed, 5 Oct 2016 17:23:32 +0000 (21:23 +0400)]
normHamming done with AVX 2 intrinsics (ver 2) (#7405)

* normHamming done with AVX 2 intrinsics.

* fixed compiling AVX2-optimized norm hamming with MSVC

7 years agoMerge pull request #7403 from tomoaki0705:fixDuplicateInclude
Alexander Alekhin [Wed, 5 Oct 2016 17:20:44 +0000 (17:20 +0000)]
Merge pull request #7403 from tomoaki0705:fixDuplicateInclude

7 years agoadd simd code when dcn equals 4 at HSV2RGB_b().
k-shinotsuka [Wed, 5 Oct 2016 13:48:27 +0000 (22:48 +0900)]
add simd code when dcn equals 4 at HSV2RGB_b().

7 years agoadd simd code when scn equals 4 at RGB2HLS_b().
k-shinotsuka [Wed, 5 Oct 2016 13:01:33 +0000 (22:01 +0900)]
add simd code when scn equals 4 at RGB2HLS_b().

7 years agoMerge pull request #7398 from vpisarev:mat2umat_copy_fix
Vadim Pisarevsky [Wed, 5 Oct 2016 12:21:41 +0000 (12:21 +0000)]
Merge pull request #7398 from vpisarev:mat2umat_copy_fix

7 years agoadd simd code when dcn equals 4 at HLS2RGB_b().
k-shinotsuka [Wed, 5 Oct 2016 12:02:53 +0000 (21:02 +0900)]
add simd code when dcn equals 4 at HLS2RGB_b().

7 years agoMerge pull request #7311 from fran6co:lsd
Vadim Pisarevsky [Wed, 5 Oct 2016 11:27:43 +0000 (11:27 +0000)]
Merge pull request #7311 from fran6co:lsd

7 years agoMerge pull request #6961 from K-Shinotsuka:issue5
Vadim Pisarevsky [Wed, 5 Oct 2016 11:23:35 +0000 (11:23 +0000)]
Merge pull request #6961 from K-Shinotsuka:issue5

7 years agoMerge pull request #7222 from mschoeneck:Improve_findContours_with_SSE2
Vadim Pisarevsky [Wed, 5 Oct 2016 11:21:37 +0000 (11:21 +0000)]
Merge pull request #7222 from mschoeneck:Improve_findContours_with_SSE2

7 years agoMerge pull request #7392 from K-Shinotsuka:issue25
Vadim Pisarevsky [Wed, 5 Oct 2016 11:19:43 +0000 (11:19 +0000)]
Merge pull request #7392 from K-Shinotsuka:issue25

7 years agoadd simd code when scn equals 4 at Lab2RGB_b().
k-shinotsuka [Wed, 5 Oct 2016 11:14:02 +0000 (20:14 +0900)]
add simd code when scn equals 4 at Lab2RGB_b().

7 years agoMerge pull request #7393 from alalek:cmake_pch_update
Vadim Pisarevsky [Wed, 5 Oct 2016 11:12:34 +0000 (11:12 +0000)]
Merge pull request #7393 from alalek:cmake_pch_update

7 years agomake sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty...
Vadim Pisarevsky [Wed, 5 Oct 2016 11:07:50 +0000 (14:07 +0300)]
make sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty. Before the patch such copy operation crashed

7 years agoremove duplicated include
Tomoaki Teshima [Tue, 4 Oct 2016 21:53:34 +0000 (06:53 +0900)]
remove duplicated include

7 years agocmake: update PCH
Alexander Alekhin [Tue, 4 Oct 2016 15:11:46 +0000 (18:11 +0300)]
cmake: update PCH

1) fix include directories
2) don't use PCH for source file with custom COMPILE_FLAGS

7 years agoadd simd code when scn equals 4 at RGB2Luv_b().
k-shinotsuka [Tue, 4 Oct 2016 13:27:48 +0000 (22:27 +0900)]
add simd code when scn equals 4 at RGB2Luv_b().

7 years agoMerge pull request #7356 from mshabunin:extend-openvx
Alexander Alekhin [Tue, 4 Oct 2016 15:14:51 +0000 (15:14 +0000)]
Merge pull request #7356 from mshabunin:extend-openvx

7 years agoMerge pull request #7282 from alalek:fix_calculations
Vadim Pisarevsky [Tue, 4 Oct 2016 15:05:42 +0000 (15:05 +0000)]
Merge pull request #7282 from alalek:fix_calculations

7 years agoAdded support for OpenVX 1.0, updated cmake part, minor fixes
mshabunin [Wed, 28 Sep 2016 12:27:11 +0000 (15:27 +0300)]
Added support for OpenVX 1.0, updated cmake part, minor fixes

7 years agoFix for OpenVX-based implementation of HAL multiplication API
Vitaly Tuzov [Tue, 27 Sep 2016 11:06:18 +0000 (14:06 +0300)]
Fix for OpenVX-based implementation of HAL multiplication API

7 years agoMerge pull request #7336 from K-Shinotsuka:issue23
Vadim Pisarevsky [Tue, 4 Oct 2016 12:29:46 +0000 (12:29 +0000)]
Merge pull request #7336 from K-Shinotsuka:issue23

7 years agoMerge pull request #7214 from mshabunin:hal_integral
Vadim Pisarevsky [Tue, 4 Oct 2016 12:26:58 +0000 (12:26 +0000)]
Merge pull request #7214 from mshabunin:hal_integral

7 years agoMerge pull request #7374 from catree:fix_hitmiss_doc_link
Vadim Pisarevsky [Tue, 4 Oct 2016 12:15:58 +0000 (12:15 +0000)]
Merge pull request #7374 from catree:fix_hitmiss_doc_link

7 years agoMerge pull request #7382 from alalek:ocl_build_fix_warnings
Vadim Pisarevsky [Tue, 4 Oct 2016 12:08:22 +0000 (12:08 +0000)]
Merge pull request #7382 from alalek:ocl_build_fix_warnings

7 years agoMerge pull request #7384 from K-Shinotsuka:issue24
Vadim Pisarevsky [Tue, 4 Oct 2016 12:06:37 +0000 (12:06 +0000)]
Merge pull request #7384 from K-Shinotsuka:issue24

7 years agoMerge pull request #7390 from alalek:fix_7388
Vadim Pisarevsky [Tue, 4 Oct 2016 12:04:54 +0000 (12:04 +0000)]
Merge pull request #7390 from alalek:fix_7388

7 years agoMerge pull request #7373 from tomoaki0705:featureCannyUniversalIntrinsic
Alexander Alekhin [Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)]
Merge pull request #7373 from tomoaki0705:featureCannyUniversalIntrinsic

7 years agoMerge pull request #7389 from alalek:fix_defines_typo
Alexander Alekhin [Mon, 3 Oct 2016 17:03:24 +0000 (17:03 +0000)]
Merge pull request #7389 from alalek:fix_defines_typo

7 years agocmake: fix for GCC 6.x
Alexander Alekhin [Mon, 3 Oct 2016 16:38:19 +0000 (19:38 +0300)]
cmake: fix for GCC 6.x

7 years agofix defines typo
Alexander Alekhin [Mon, 3 Oct 2016 15:28:31 +0000 (18:28 +0300)]
fix defines typo

7 years agouse universal intrinsic in canny
Tomoaki Teshima [Fri, 30 Sep 2016 15:22:24 +0000 (00:22 +0900)]
use universal intrinsic in canny
  * add v_abs for universal intrinsic
  * add test of v_abs in test_intrin
  * fix compile error on gcc
  * fix bool OR operation

7 years agoadd simd code when dcn equals 4 at Luv2RGB_b().
k-shinotsuka [Sun, 2 Oct 2016 09:38:15 +0000 (18:38 +0900)]
add simd code when dcn equals 4 at Luv2RGB_b().

7 years agoMerge pull request #7358 from convoyinc:ios-framework-module-exclusion
Alexander Alekhin [Sun, 2 Oct 2016 11:38:59 +0000 (11:38 +0000)]
Merge pull request #7358 from convoyinc:ios-framework-module-exclusion

7 years agoocl: autogenerated code
Alexander Alekhin [Sat, 1 Oct 2016 23:36:26 +0000 (02:36 +0300)]
ocl: autogenerated code

7 years agoocl: eliminate build warning
Alexander Alekhin [Sat, 1 Oct 2016 23:33:41 +0000 (02:33 +0300)]
ocl: eliminate build warning

Templates are replaced by macro

7 years agoMerge pull request #7353 from alalek:ocl_update_canny_test_threshold
Vadim Pisarevsky [Sat, 1 Oct 2016 15:48:21 +0000 (15:48 +0000)]
Merge pull request #7353 from alalek:ocl_update_canny_test_threshold