projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
416830f
)
Merge pull request #22865 from cpoerschke:3.4-issue-22860
author
Christine Poerschke
<cpoerschke@apache.org>
Sat, 3 Dec 2022 05:29:04 +0000
(
05:29
+0000)
committer
GitHub
<noreply@github.com>
Sat, 3 Dec 2022 05:29:04 +0000
(
05:29
+0000)
ocl_minMaxIdx to call minmaxloc.cl for OpenCL 1.2+ only
modules/core/src/minmax.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/minmax.cpp
b/modules/core/src/minmax.cpp
index
43785d8
..
8f807be
100644
(file)
--- a/
modules/core/src/minmax.cpp
+++ b/
modules/core/src/minmax.cpp
@@
-973,6
+973,12
@@
bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int* minLoc
return false;
#endif
+ if (dev.deviceVersionMajor() == 1 && dev.deviceVersionMinor() < 2)
+ {
+ // 'static' storage class specifier used by "minmaxloc" is available from OpenCL 1.2+ only
+ return false;
+ }
+
bool doubleSupport = dev.doubleFPConfig() > 0, haveMask = !_mask.empty(),
haveSrc2 = _src2.kind() != _InputArray::NONE;
int type = _src.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type),