Merge pull request #3117 from KruchDmitriy:canny_opt

d6681597 · Vadim Pisarevsky · 4d9d7e6d · 6ed168d3 · d6681597 · d6681597
Commit d6681597 authored Aug 27, 2014 by Vadim Pisarevsky
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

canny.cpp modules/imgproc/src/canny.cpp +0 -0

canny.cl modules/imgproc/src/opencl/canny.cl +0 -0

No files found.
--- a/modules/imgproc/src/canny.cpp
+++ b/modules/imgproc/src/canny.cpp
--- a/modules/imgproc/src/opencl/canny.cl
+++ b/modules/imgproc/src/opencl/canny.cl