Remove implicit narrowing conversions

KhronosGroup · Nov 16, 2023 · 531f3a4 · 531f3a4
1 parent 8cc4341
commit 531f3a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/include/CL/SDK/InteropWindow.hpp b/lib/include/CL/SDK/InteropWindow.hpp
@@ -13,13 +13,16 @@
 #include <SFML/Window.hpp>
 #include <SFML/OpenGL.hpp>
 
+// STL includes
+#include <type_traits>
+
 namespace cl {
 namespace sdk {
     class SDKCPP_EXPORT InteropWindow : public sf::Window {
     public:
         explicit InteropWindow(
             sf::VideoMode mode, const sf::String& title,
-            sf::Uint32 style = sf::Style::Default,
+            decltype(sf::Style::Default) style = sf::Style::Default,
             const sf::ContextSettings& settings = sf::ContextSettings{},
             cl_uint platform_id = 0, cl_uint device_id = 0,
             cl_bitfield device_type = CL_DEVICE_TYPE_DEFAULT);

diff --git a/lib/src/SDK/Image.c b/lib/src/SDK/Image.c
@@ -40,7 +40,7 @@ cl_sdk_image cl_sdk_read_image(const char* const file_name, cl_int* const error)
 
 static char* to_lowercase(const char* const s, char* const d, const size_t n)
 {
-    for (size_t i = 0; i < n; ++i) d[i] = tolower(s[i]);
+    for (size_t i = 0; i < n; ++i) d[i] = (char)tolower(s[i]);
     return d;
 }
 

diff --git a/lib/src/SDK/InteropWindow.cpp b/lib/src/SDK/InteropWindow.cpp
@@ -3,12 +3,13 @@
 #include <CL/SDK/InteropContext.hpp>
 
 cl::sdk::InteropWindow::InteropWindow(sf::VideoMode mode,
-                                      const sf::String& title, sf::Uint32 style,
+                                      const sf::String& title,
+                                      decltype(sf::Style::Default) style,
                                       const sf::ContextSettings& settings,
                                       cl_uint platform_id, cl_uint device_id,
                                       cl_bitfield device_type)
-    : sf::Window{ mode, title, style, settings }, plat_id{ platform_id },
-      dev_id{ device_id }, dev_type{ device_type }
+    : sf::Window{ mode, title, static_cast<sf::Uint32>(style), settings },
+      plat_id{ platform_id }, dev_id{ device_id }, dev_type{ device_type }
 {}
 
 void cl::sdk::InteropWindow::run()