Merge pull request #16723 from jansol:master

a694e507 · Alexander Alekhin · 4f288a1e · ad16c243 · a694e507
Commit a694e507 authored Mar 05, 2020 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 9 deletions

ocl.cpp modules/core/src/ocl.cpp +12 -9

No files found.
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -6445,16 +6445,19 @@ struct Image2D::Impl
                                                CL_MEM_OBJECT_IMAGE2D, numFormats,
                                                NULL, &numFormats);
        CV_OCL_DBG_CHECK_RESULT(err, "clGetSupportedImageFormats(CL_MEM_OBJECT_IMAGE2D, NULL)");
-        AutoBuffer<cl_image_format> formats(numFormats);
+        if (numFormats > 0)
-        err = clGetSupportedImageFormats(context, CL_MEM_READ_WRITE,
+        {
-                                         CL_MEM_OBJECT_IMAGE2D, numFormats,
+            AutoBuffer<cl_image_format> formats(numFormats);
-                                         formats.data(), NULL);
+            err = clGetSupportedImageFormats(context, CL_MEM_READ_WRITE,
-        CV_OCL_DBG_CHECK_RESULT(err, "clGetSupportedImageFormats(CL_MEM_OBJECT_IMAGE2D, formats)");
+                                             CL_MEM_OBJECT_IMAGE2D, numFormats,
-        for (cl_uint i = 0; i < numFormats; ++i)
+                                             formats.data(), NULL);
-        {
+            CV_OCL_DBG_CHECK_RESULT(err, "clGetSupportedImageFormats(CL_MEM_OBJECT_IMAGE2D, formats)");
-            if (!memcmp(&formats[i], &format, sizeof(format)))
+            for (cl_uint i = 0; i < numFormats; ++i)
            {
-                return true;
+                if (!memcmp(&formats[i], &format, sizeof(format)))
+                {
+                    return true;
+                }
            }
        }
        return false;