Return background color data as 32-bit ints across native code interf…

…ace due to uint8_t issues with Rust.
discord · Nov 11, 2024 · 0fac2ae · 0fac2ae
1 parent 2e756fc
commit 0fac2ae
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/giflib.cpp b/giflib.cpp
@@ -1168,8 +1168,13 @@ struct GifAnimationInfo giflib_decoder_get_animation_info(const giflib_decoder d
                         found_gcb = true;
                         DGifExtensionToGCB(ExtData[0], &ExtData[1], &gcb);
                         // Get background color as soon as we have the GCB
-                        extract_background_color(gif, &gcb, &info.bg_red, &info.bg_green, 
-                                              &info.bg_blue, &info.bg_alpha);
+                        uint8_t bg_red, bg_green, bg_blue, bg_alpha;
+                        extract_background_color(gif, &gcb, &bg_red, &bg_green,
+                                              &bg_blue, &bg_alpha);
+                        info.bg_red = bg_red;
+                        info.bg_green = bg_green;
+                        info.bg_blue = bg_blue;
+                        info.bg_alpha = bg_alpha;
                     }
                     // Look for NETSCAPE2.0 extension
                     else if (!found_loop_count && 
@@ -1225,8 +1230,15 @@ struct GifAnimationInfo giflib_decoder_get_animation_info(const giflib_decoder d
 
     // If we never found a GCB, still need to set background color
     if (!found_gcb) {
-        extract_background_color(gif, &gcb, &info.bg_red, &info.bg_green, 
-                               &info.bg_blue, &info.bg_alpha);
+        uint8_t bg_red, bg_green, bg_blue, bg_alpha;
+        extract_background_color(gif, &gcb, &bg_red, &bg_green,
+                               &bg_blue, &bg_alpha);
+
+        // convert to int to handle uint limitations in rust FFI
+        info.bg_red = bg_red;
+        info.bg_green = bg_green;
+        info.bg_blue = bg_blue;
+        info.bg_alpha = bg_alpha;
     }
 
 cleanup:

diff --git a/giflib.hpp b/giflib.hpp
@@ -10,10 +10,10 @@ extern "C" {
 struct GifAnimationInfo {
     int loop_count;
     int frame_count;
-    uint8_t bg_red;
-    uint8_t bg_green;
-    uint8_t bg_blue;
-    uint8_t bg_alpha;
+    int bg_red;
+    int bg_green;
+    int bg_blue;
+    int bg_alpha;
 };
 
 #define GIF_DISPOSE_NONE 0