Skip to content

Commit

Permalink
Merge pull request opencv#2811 from arkunze:pullreq/140516-erode
Browse files Browse the repository at this point in the history
  • Loading branch information
alalek authored and OpenCV Buildbot committed May 31, 2014
2 parents 78badcd + 033aebe commit abe3765
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions modules/imgproc/src/opencl/morph.cl
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,14 @@
#endif

#ifdef ERODE
#ifdef INTEL_DEVICE
#if defined(INTEL_DEVICE) && (DEPTH_0)
// workaround for bug in Intel HD graphics drivers (10.18.10.3496 or older)
#define MORPH_OP(A,B) ((A) < (B) ? (A) : (B))
#define __CAT(x, y) x##y
#define CAT(x, y) __CAT(x, y)
#define WA_CONVERT_1 CAT(convert_uint, cn)
#define WA_CONVERT_2 CAT(convert_, T)
#define convert_uint1 convert_uint
#define MORPH_OP(A,B) WA_CONVERT_2(min(WA_CONVERT_1(A),WA_CONVERT_1(B)))
#else
#define MORPH_OP(A,B) min((A),(B))
#endif
Expand Down

0 comments on commit abe3765

Please sign in to comment.