Merge pull request #3044 from akarsakov:fix_ocl_tests
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 7 Aug 2014 20:14:17 +0000 (20:14 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 7 Aug 2014 20:14:17 +0000 (20:14 +0000)
1  2 
modules/imgproc/src/pyramids.cpp

Simple merge