platform/upstream/opencv.git
7 years agocmake: update matlab path
Alexander Alekhin [Thu, 1 Sep 2016 12:17:32 +0000 (15:17 +0300)]
cmake: update matlab path

7 years agoMerge pull request #7182 from mself:two_channel_universal_intrinsics
Maksim Shabunin [Wed, 31 Aug 2016 10:11:43 +0000 (10:11 +0000)]
Merge pull request #7182 from mself:two_channel_universal_intrinsics

7 years agoMerge pull request #7205 from souch55:Fixtrans
Alexander Alekhin [Wed, 31 Aug 2016 09:51:45 +0000 (09:51 +0000)]
Merge pull request #7205 from souch55:Fixtrans

7 years agoFixed traincascade read issue
sourin [Wed, 31 Aug 2016 05:59:15 +0000 (11:29 +0530)]
Fixed traincascade read issue

7 years agoMerge pull request #7170 from alalek:fix_build
Alexander Alekhin [Mon, 29 Aug 2016 10:15:58 +0000 (10:15 +0000)]
Merge pull request #7170 from alalek:fix_build

7 years agoMerge pull request #7177 from alalek:msvs_layout
Alexander Alekhin [Mon, 29 Aug 2016 09:36:49 +0000 (09:36 +0000)]
Merge pull request #7177 from alalek:msvs_layout

7 years agoMerge pull request #7140 from Asalle:fix-7136-Bounding_Box_explanation
Maksim Shabunin [Mon, 29 Aug 2016 08:42:02 +0000 (08:42 +0000)]
Merge pull request #7140 from Asalle:fix-7136-Bounding_Box_explanation

7 years agoMerge pull request #7180 from mrquorr:add_dcm_test
Maksim Shabunin [Mon, 29 Aug 2016 08:40:02 +0000 (08:40 +0000)]
Merge pull request #7180 from mrquorr:add_dcm_test

7 years ago2-channel interleaved load/store for universal intrinsics (float only)
Matthew Self [Wed, 17 Aug 2016 07:17:45 +0000 (00:17 -0700)]
2-channel interleaved load/store for universal intrinsics (float only)

* Added 2-channel ops to match existing 3-channel and 4-channel ops

* v_load_deinterleave() and v_store_interleave()

* Implements float32x4 only on SSE (but all types on NEON and CPP)

* Includes tests

* Will be used to vectorize 2D functions, such as estimateAffine2D()

7 years agoadd explanation to the Bounding Box and Circles tutorial
Asal Mirzaieva [Fri, 19 Aug 2016 10:48:56 +0000 (13:48 +0300)]
add explanation to the Bounding Box and Circles tutorial

 - also some minor changes to the respective sample cpp file

7 years agotest added, only if HAVE_GDCM is on
mrquorr [Fri, 12 Aug 2016 05:14:01 +0000 (00:14 -0500)]
test added, only if HAVE_GDCM is on

7 years agoadd 2 extra methods to ml::TrainData (#7169)
Vadim Pisarevsky [Fri, 26 Aug 2016 12:25:46 +0000 (16:25 +0400)]
add 2 extra methods to ml::TrainData (#7169)

* expose 2 extra methods from ml::TrainData: getNames() and getVarSymbolFlags(). The first one returns text labels from CSV (if the data has been loaded from CSV); the second one returns a matrix of boolean values; its n-th element is 1 iff the corresponding column in the CSV uses symbolic names, not numbers.

* check that the dynamic_cast succeeds

7 years agoAdd Grana's connected components algorithm for 8-way connectivity. (#6823)
Vadim Pisarevsky [Fri, 26 Aug 2016 12:01:00 +0000 (16:01 +0400)]
Add Grana's connected components algorithm for 8-way connectivity. (#6823)

* Add Grana's connected components algorithm for 8-way connectivity. That algorithm is faster than Wu's one (currently implemented in opencv). For more details see https://github.com/prittt/YACCLAB.

* New functions signature and distance transform compatibility

* Add tests to imgproc/test/test_connectedcomponents.cpp

* Change of test_connectedcomponents.cpp for c++98 support

7 years agoMerge pull request #7158 from sturkmen72:documentation_fix
Vadim Pisarevsky [Fri, 26 Aug 2016 11:40:19 +0000 (11:40 +0000)]
Merge pull request #7158 from sturkmen72:documentation_fix

7 years agoMerge pull request #7149 from Cartucho:patch-1
Vadim Pisarevsky [Fri, 26 Aug 2016 11:39:51 +0000 (11:39 +0000)]
Merge pull request #7149 from Cartucho:patch-1

7 years agoMerge pull request #7093 from mshabunin:openvx_hal
Vadim Pisarevsky [Fri, 26 Aug 2016 11:22:52 +0000 (11:22 +0000)]
Merge pull request #7093 from mshabunin:openvx_hal

7 years agoMerge pull request #7167 from alalek:modules_deps
Vadim Pisarevsky [Fri, 26 Aug 2016 11:16:45 +0000 (11:16 +0000)]
Merge pull request #7167 from alalek:modules_deps

7 years agoMerge pull request #7172 from valeriyvan:iosfixes
Vadim Pisarevsky [Fri, 26 Aug 2016 11:11:49 +0000 (11:11 +0000)]
Merge pull request #7172 from valeriyvan:iosfixes

7 years agocmake: minimize MSVS projects layout
Alexander Alekhin [Fri, 26 Aug 2016 10:33:47 +0000 (13:33 +0300)]
cmake: minimize MSVS projects layout

Also put "object" targets to off by default (they doesn't work well)

7 years agoUnifies Obj-C property attributes changing retain to strong
Valeriy Van [Thu, 25 Aug 2016 18:40:16 +0000 (21:40 +0300)]
Unifies Obj-C property attributes changing retain to strong

strong and retain are synonymous but using strong along with  obsolete synonym retain in one file is negligent

7 years agofix Win build, change default WINNT macro to WinXP
Alexander Alekhin [Thu, 25 Aug 2016 13:21:52 +0000 (16:21 +0300)]
fix Win build, change default WINNT macro to WinXP

Returning to Win2k value is possible via this CMake option:

    cmake -DOPENCV_EXTRA_FLAGS="/D_WIN32_WINNT=0x0500" ...

7 years agoOpenVX HAL
Maksim Shabunin [Thu, 25 Aug 2016 13:08:35 +0000 (16:08 +0300)]
OpenVX HAL

7 years agoMerge pull request #7162 from kurenai:update_png
Alexander Alekhin [Thu, 25 Aug 2016 13:00:47 +0000 (13:00 +0000)]
Merge pull request #7162 from kurenai:update_png

7 years agofix modules deps
Alexander Alekhin [Thu, 25 Aug 2016 11:57:12 +0000 (14:57 +0300)]
fix modules deps

7 years agoMerge pull request #7166 from tomoaki0705:brushUpFp16
Alexander Alekhin [Thu, 25 Aug 2016 11:49:23 +0000 (11:49 +0000)]
Merge pull request #7166 from tomoaki0705:brushUpFp16

7 years agoUpdate libpng to 1.6.24
kurenai [Thu, 25 Aug 2016 01:48:46 +0000 (09:48 +0800)]
Update libpng to 1.6.24
Enable SSE optimization

7 years agobrush up fp16 implementation
Tomoaki Teshima [Wed, 24 Aug 2016 09:32:13 +0000 (18:32 +0900)]
brush up fp16 implementation
  * DRY
  * switch to Cv32suf and remove fp32Int32
  * add Cv16suf

7 years agoMerge pull request #7088 from wiryls:FileStorageJSON
Vadim Pisarevsky [Wed, 24 Aug 2016 16:48:58 +0000 (16:48 +0000)]
Merge pull request #7088 from wiryls:FileStorageJSON

7 years agoAdd two tests.
MYLS [Wed, 24 Aug 2016 09:01:57 +0000 (17:01 +0800)]
Add two tests.

- one test for type_id;
- another for comments in JSON;

7 years agoMerge pull request #7157 from valeriyvan/patch-1
Vadim Pisarevsky [Tue, 23 Aug 2016 20:33:06 +0000 (00:33 +0400)]
Merge pull request #7157 from valeriyvan/patch-1

Fixes spelling in comment

7 years agoMake Up
Suleyman TURKMEN [Tue, 23 Aug 2016 17:57:20 +0000 (20:57 +0300)]
Make Up

7 years agoFixes spelling in comment
Valeriy Van [Tue, 23 Aug 2016 19:04:41 +0000 (22:04 +0300)]
Fixes spelling in comment

7 years agoMerge pull request #7141 from lupustr3:pvlasov/instrumentation_extension
Alexander Alekhin [Tue, 23 Aug 2016 16:48:25 +0000 (16:48 +0000)]
Merge pull request #7141 from lupustr3:pvlasov/instrumentation_extension

7 years agoMerge pull request #7150 from mpkh:patch-1
Alexander Alekhin [Mon, 22 Aug 2016 15:11:18 +0000 (15:11 +0000)]
Merge pull request #7150 from mpkh:patch-1

7 years agofix building on FreeBSD
mpkh [Mon, 22 Aug 2016 13:17:06 +0000 (17:17 +0400)]
fix building on FreeBSD

resolve undeclared identifier close error

7 years agoMerge pull request #6937 from catree:add_peopledetect_sample
Vadim Pisarevsky [Mon, 22 Aug 2016 12:48:41 +0000 (12:48 +0000)]
Merge pull request #6937 from catree:add_peopledetect_sample

7 years agoMerge pull request #7142 from alalek:fix_hls_test_check
Vadim Pisarevsky [Mon, 22 Aug 2016 12:26:54 +0000 (12:26 +0000)]
Merge pull request #7142 from alalek:fix_hls_test_check

7 years ago Update hull_demo.cpp
Cartucho [Mon, 22 Aug 2016 11:45:24 +0000 (13:45 +0200)]
 Update hull_demo.cpp

The Mat "src_copy" is never used.

7 years agoMerge pull request #7145 from Bleach665:vs2010_fix
Alexander Alekhin [Sat, 20 Aug 2016 21:51:47 +0000 (21:51 +0000)]
Merge pull request #7145 from Bleach665:vs2010_fix

7 years agocasting to fix vs2010 compile error
Bleach [Sat, 20 Aug 2016 13:29:15 +0000 (16:29 +0300)]
casting to fix vs2010 compile error

7 years agoMerge pull request #7122 from haikusw:UIImageAlphaToMatFix
Vadim Pisarevsky [Sat, 20 Aug 2016 10:38:35 +0000 (10:38 +0000)]
Merge pull request #7122 from haikusw:UIImageAlphaToMatFix

7 years agoInstrumentation for OpenCV API regions and IPP functions;
Pavel Vlasov [Thu, 18 Aug 2016 06:53:00 +0000 (09:53 +0300)]
Instrumentation for OpenCV API regions and IPP functions;

7 years agoimgproc: fix accuracy check for HLS cvtColor
Alexander Alekhin [Fri, 19 Aug 2016 14:30:57 +0000 (17:30 +0300)]
imgproc: fix accuracy check for HLS cvtColor

7 years agoMerge pull request #7135 from lupustr3:pvlasov/icv_restrictions_remove
Alexander Alekhin [Fri, 19 Aug 2016 13:23:47 +0000 (13:23 +0000)]
Merge pull request #7135 from lupustr3:pvlasov/icv_restrictions_remove

7 years agoOutdated ICV restrictions were removed;
Pavel Vlasov [Wed, 17 Aug 2016 07:25:19 +0000 (10:25 +0300)]
Outdated ICV restrictions were removed;

7 years agoMerge pull request #7108 from K-Shinotsuka:issue16
Vadim Pisarevsky [Fri, 19 Aug 2016 08:10:51 +0000 (08:10 +0000)]
Merge pull request #7108 from K-Shinotsuka:issue16

7 years agoMerge pull request #7101 from lupustr3:pvlasov/instrumentation
Alexander Alekhin [Thu, 18 Aug 2016 14:56:40 +0000 (14:56 +0000)]
Merge pull request #7101 from lupustr3:pvlasov/instrumentation

7 years agoMerge pull request #7129 from paroj:mousecallback-dry-code
Alexander Alekhin [Thu, 18 Aug 2016 14:12:45 +0000 (14:12 +0000)]
Merge pull request #7129 from paroj:mousecallback-dry-code

7 years agoMerge pull request #6945 from sturkmen72:update_documentation
Vadim Pisarevsky [Thu, 18 Aug 2016 13:23:17 +0000 (13:23 +0000)]
Merge pull request #6945 from sturkmen72:update_documentation

7 years agoMerge pull request #6855 from yigitsoy:patch-1
Vadim Pisarevsky [Thu, 18 Aug 2016 13:18:59 +0000 (13:18 +0000)]
Merge pull request #6855 from yigitsoy:patch-1

7 years agoMerge pull request #7055 from gylns:master
Vadim Pisarevsky [Thu, 18 Aug 2016 13:17:18 +0000 (13:17 +0000)]
Merge pull request #7055 from gylns:master

7 years agoMerge pull request #7087 from terfendail/master
Vadim Pisarevsky [Thu, 18 Aug 2016 13:12:38 +0000 (17:12 +0400)]
Merge pull request #7087 from terfendail/master

Fix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON

7 years agoMerge pull request #7097 from JoeHowse:master
Vadim Pisarevsky [Thu, 18 Aug 2016 13:08:56 +0000 (13:08 +0000)]
Merge pull request #7097 from JoeHowse:master

7 years agoMerge pull request #7111 from sovrasov:mkl_lapack
Vadim Pisarevsky [Thu, 18 Aug 2016 13:05:26 +0000 (13:05 +0000)]
Merge pull request #7111 from sovrasov:mkl_lapack

7 years agoMerge pull request #7125 from alalek:cmake_apple_usr_local_lib
Vadim Pisarevsky [Thu, 18 Aug 2016 13:02:23 +0000 (13:02 +0000)]
Merge pull request #7125 from alalek:cmake_apple_usr_local_lib

7 years agoMerge pull request #7126 from paroj:buttonlayout
Alexander Alekhin [Thu, 18 Aug 2016 10:36:47 +0000 (10:36 +0000)]
Merge pull request #7126 from paroj:buttonlayout

7 years agohighgui: window_QT mousecallback code refactored using DRY
Alexandr Kondratev [Sat, 23 Jul 2016 15:10:36 +0000 (18:10 +0300)]
highgui: window_QT mousecallback code refactored using DRY

7 years agoMerge pull request #6972 from vicproon:fix_6836_other_places
Alexander Alekhin [Thu, 18 Aug 2016 09:33:07 +0000 (09:33 +0000)]
Merge pull request #6972 from vicproon:fix_6836_other_places

7 years agoMerge pull request #7085 from sovrasov:hal_doc_fix
Alexander Alekhin [Wed, 17 Aug 2016 15:15:08 +0000 (15:15 +0000)]
Merge pull request #7085 from sovrasov:hal_doc_fix

7 years agoMerge pull request #7094 from terfendail:MSER_fix
Alexander Alekhin [Wed, 17 Aug 2016 15:14:33 +0000 (15:14 +0000)]
Merge pull request #7094 from terfendail:MSER_fix

7 years agocmake: add /usr/local/lib on Apple platform
Alexander Alekhin [Wed, 17 Aug 2016 10:34:59 +0000 (13:34 +0300)]
cmake: add /usr/local/lib on Apple platform

7 years agoImplementations instrumentation framework for OpenCV performance system;
Pavel Vlasov [Mon, 15 Aug 2016 14:12:45 +0000 (17:12 +0300)]
Implementations instrumentation framework for OpenCV performance system;

7 years agohighgui: allow specifying that a button should create a new buttonbar
Pavel Rojtberg [Wed, 17 Aug 2016 12:29:28 +0000 (14:29 +0200)]
highgui: allow specifying that a button should create a new buttonbar

7 years agoMerge pull request #7095 from PkLab:fix_rho&phi_doc
Alexander Alekhin [Wed, 17 Aug 2016 10:46:30 +0000 (10:46 +0000)]
Merge pull request #7095 from PkLab:fix_rho&phi_doc

7 years agoStatic Lapack linkage
Sovrasov [Wed, 10 Aug 2016 11:56:04 +0000 (12:56 +0100)]
Static Lapack linkage

7 years agohandle images with alpha better
Morrison [Tue, 16 Aug 2016 21:59:24 +0000 (14:59 -0700)]
handle images with alpha better

UIImages with alpha were ending up with garbage pixels in background (random memory values).  Need to initialize matrix pixels before drawing UIImage with alpha on it.

Note: didn’t fix Grayscale image with alpha stripping alpha in UIImage -> Mat conversion.

7 years agoMerge pull request #7117 from patsp:fix_tiff_imdecode_remove_temporary_file
Alexander Alekhin [Tue, 16 Aug 2016 15:40:50 +0000 (15:40 +0000)]
Merge pull request #7117 from patsp:fix_tiff_imdecode_remove_temporary_file

7 years agoMerge pull request #7056 from ludv1x:python-extra-bindings
Maksim Shabunin [Tue, 16 Aug 2016 13:00:30 +0000 (13:00 +0000)]
Merge pull request #7056 from ludv1x:python-extra-bindings

7 years agoFix rho,phi exchange and amend linearPolar & logPolar docs with details and pics.
PkLab.net [Thu, 11 Aug 2016 17:32:29 +0000 (19:32 +0200)]
Fix rho,phi exchange and amend linearPolar & logPolar docs with details and pics.

7 years agoAdding of user-defined type conversions for python bindings inside module directories
Vitaliy Lyudvichenko [Sat, 6 Aug 2016 16:46:17 +0000 (19:46 +0300)]
Adding of user-defined type conversions for python bindings inside module directories
Adding of destructor and placement new constructors for classes wrapped with CV_EXPORTS_W_SIMPLE macro

7 years agoMerge pull request #7082 from souch55:Fixmerge
Maksim Shabunin [Tue, 16 Aug 2016 09:30:39 +0000 (09:30 +0000)]
Merge pull request #7082 from souch55:Fixmerge

7 years agoMerge pull request #7091 from alalek:reduce_precommit_ios_build
Maksim Shabunin [Tue, 16 Aug 2016 09:18:54 +0000 (09:18 +0000)]
Merge pull request #7091 from alalek:reduce_precommit_ios_build

7 years agoFix temporary file removal in imdecode for tiff
Patrick Spettel [Tue, 16 Aug 2016 08:49:11 +0000 (10:49 +0200)]
Fix temporary file removal in imdecode for tiff

The TiffDecoder keeps an open file handle.
As a consequence the file cannot be removed
before the TiffDecoder closes the file.

7 years agoCanny with own gradient (#6664)
LaurentBerger [Tue, 16 Aug 2016 07:51:09 +0000 (09:51 +0200)]
Canny with own gradient (#6664)

* example using the Canny algorithm with custom image gradient.

* Modified example to integrate new function canny with custom gradient

7 years agoMerge pull request #7110 from tomoaki0705:featureUniversalIntrinsicAccumulate
Alexander Alekhin [Mon, 15 Aug 2016 14:54:10 +0000 (14:54 +0000)]
Merge pull request #7110 from tomoaki0705:featureUniversalIntrinsicAccumulate

7 years agoUpdate documentation ( tutorials )
Suleyman TURKMEN [Mon, 18 Jul 2016 13:32:05 +0000 (16:32 +0300)]
Update documentation ( tutorials )

7 years agoReplaced quiet return from MSER:detectRegion function with exeption throwing to notif...
Vitaly Tuzov [Mon, 15 Aug 2016 08:28:52 +0000 (11:28 +0300)]
Replaced quiet return from MSER:detectRegion function with exeption throwing to notify user in case small image is processed

7 years agoimprove YCrCb2RGB_i<uchar>()
k-shinotsuka [Sun, 14 Aug 2016 14:24:33 +0000 (23:24 +0900)]
improve YCrCb2RGB_i<uchar>()

7 years agoMerge pull request #7106 from lupustr3:pvlasov/ipp_hal_fix
Maksim Shabunin [Mon, 15 Aug 2016 10:08:44 +0000 (10:08 +0000)]
Merge pull request #7106 from lupustr3:pvlasov/ipp_hal_fix

7 years agoMerge pull request #7077 from LaurentBerger:I7063
Maksim Shabunin [Mon, 15 Aug 2016 09:08:44 +0000 (09:08 +0000)]
Merge pull request #7077 from LaurentBerger:I7063

7 years agoMerge pull request #6995 from PkLab:i6746_naming_videoio_enums
Maksim Shabunin [Mon, 15 Aug 2016 09:01:24 +0000 (09:01 +0000)]
Merge pull request #6995 from PkLab:i6746_naming_videoio_enums

7 years agouse universal intrinsic in accumulate series
Tomoaki Teshima [Sun, 14 Aug 2016 23:40:13 +0000 (08:40 +0900)]
use universal intrinsic in accumulate series
      * accumulate, accumulateSquare, accumulateProduct and accumulateWeighted

7 years agoMSER: all test passed.
will hunt [Sun, 7 Aug 2016 00:38:38 +0000 (08:38 +0800)]
MSER: all test passed.
1. if a component's variation is a global minimum than it should be a local minimum
2. for the small image with invert and blur, the MSERs number should be 20

7 years agoIPP was enabled in mathfuncs_core;
Pavel Vlasov [Fri, 12 Aug 2016 15:16:04 +0000 (18:16 +0300)]
IPP was enabled in mathfuncs_core;
Exp and Log IPP implementations are changed to hal interface;

7 years agoMerge pull request #7104 from alalek:port_6106
Alexander Alekhin [Fri, 12 Aug 2016 13:51:55 +0000 (13:51 +0000)]
Merge pull request #7104 from alalek:port_6106

7 years agofixed compilation warning
Ilya Lavrenov [Thu, 11 Feb 2016 21:33:18 +0000 (00:33 +0300)]
fixed compilation warning

7 years agoMerge pull request #7102 from lupustr3:pvlasov/ipp_switch_fix
Alexander Alekhin [Fri, 12 Aug 2016 10:39:44 +0000 (10:39 +0000)]
Merge pull request #7102 from lupustr3:pvlasov/ipp_switch_fix

7 years agoFix for MSER::detectRegions crash on images with either dimension less than 3
Vitaly Tuzov [Thu, 11 Aug 2016 17:20:36 +0000 (20:20 +0300)]
Fix for MSER::detectRegions crash on images with either dimension less than 3

7 years agoFix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON
Vitaly Tuzov [Wed, 10 Aug 2016 16:56:46 +0000 (19:56 +0300)]
Fix for incorrect calcOpticalFlowPyrLK result evaluation with ARM NEON

7 years agoIPP enabling fix and typo fix;
Pavel Vlasov [Fri, 12 Aug 2016 06:50:42 +0000 (09:50 +0300)]
IPP enabling fix and typo fix;

7 years agoRemoving whitespace to appease doc builder
Joe Howse [Fri, 12 Aug 2016 03:31:50 +0000 (00:31 -0300)]
Removing whitespace to appease doc builder

7 years agoImproved cat face cascades (lower false positive rate)
Joe Howse [Thu, 11 Aug 2016 23:47:08 +0000 (20:47 -0300)]
Improved cat face cascades (lower false positive rate)

7 years agoNaming some enumerations in videoio
PkLab.net [Tue, 26 Jul 2016 14:48:30 +0000 (16:48 +0200)]
Naming some enumerations in videoio

7 years agoMerge pull request #7062 from kurenai:return_if_camera_disconnected
Alexander Alekhin [Thu, 11 Aug 2016 14:07:42 +0000 (14:07 +0000)]
Merge pull request #7062 from kurenai:return_if_camera_disconnected

7 years agoMerge pull request #7057 from K-Shinotsuka:issue13
Maksim Shabunin [Thu, 11 Aug 2016 11:46:33 +0000 (11:46 +0000)]
Merge pull request #7057 from K-Shinotsuka:issue13

7 years agoFix HAL documentation
Vladislav Sovrasov [Wed, 10 Aug 2016 13:15:14 +0000 (16:15 +0300)]
Fix HAL documentation

7 years agoMerge pull request #7069 from StevenPuttemans:try_fix_cuda
Maksim Shabunin [Thu, 11 Aug 2016 11:06:34 +0000 (11:06 +0000)]
Merge pull request #7069 from StevenPuttemans:try_fix_cuda

7 years agoMerge pull request #7090 from daB0bby:patch-1
Maksim Shabunin [Thu, 11 Aug 2016 10:57:33 +0000 (10:57 +0000)]
Merge pull request #7090 from daB0bby:patch-1

7 years agoios: reduce number of test configurations in precommit builds
Alexander Alekhin [Thu, 11 Aug 2016 10:47:04 +0000 (13:47 +0300)]
ios: reduce number of test configurations in precommit builds

7 years agoMerge pull request #7075 from alalek:ocl_fix_canny_perf_test
Alexander Alekhin [Thu, 11 Aug 2016 09:19:44 +0000 (09:19 +0000)]
Merge pull request #7075 from alalek:ocl_fix_canny_perf_test