Add Blur cpp example and improve image error handling (#72)

* Add Blur cpp example and improve image error handling * Use clang formatting and include math.h * update submodule , fix event passing and minor comment fix --------- Co-authored-by: PRZEMYSLAW_WISNIEWSKI <przemyslaw.wisniewski@mobica.com>
KhronosGroup · May 16, 2023 · f510201 · f510201
1 parent c98aa82
commit f510201
Show file tree

Hide file tree

Showing 6 changed files with 1,040 additions and 2 deletions.
diff --git a/lib/include/CL/SDK/Image.hpp b/lib/include/CL/SDK/Image.hpp
@@ -10,7 +10,7 @@ namespace cl {
 namespace sdk {
     struct Image
     {
-        int width, height, pixel_size;
+        int width = 0, height = 0, pixel_size = 1;
         cl::vector<unsigned char> pixels;
     };
 

diff --git a/lib/src/SDK/Image.cpp b/lib/src/SDK/Image.cpp
@@ -32,6 +32,18 @@ namespace sdk {
         Image im;
         unsigned char* data =
             stbi_load(file_name, &im.width, &im.height, &im.pixel_size, 0);
+
+        if (data == nullptr)
+        {
+            std::string err_msg{ "Not possible to read file" };
+            const char* load_msg = stbi_failure_reason();
+
+            if (load_msg) err_msg += std::string(": ") + load_msg;
+
+            cl::util::detail::errHandler(CL_INVALID_ARG_VALUE, &err,
+                                         err_msg.c_str());
+        }
+
         im.pixels.insert(im.pixels.end(), data,
                          data + im.width * im.height * im.pixel_size);
 
@@ -42,7 +54,7 @@ namespace sdk {
             cl::util::detail::errHandler(CL_INVALID_ARG_VALUE, &err,
                                          "File read error!");
 
-        if (error != NULL) *error = err;
+        if (error != nullptr) *error = err;
         return im;
     }
 

diff --git a/samples/core/blur/CMakeLists.txt b/samples/core/blur/CMakeLists.txt
@@ -18,3 +18,10 @@ add_sample(
     VERSION 300
     SOURCES main.c
     KERNELS blur.cl)
+
+add_sample(
+    TEST
+    TARGET blurcpp
+    VERSION 300
+    SOURCES main.cpp blur.cpp blur.hpp
+    KERNELS blur.cl)