Make rive_decoders compile on Windows Diffs= b3a367dad Make rive_decoders compile on Windows (#5733) Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
diff --git a/.rive_head b/.rive_head index 812cc49..65381f7 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -d3e75b38d209bf0b85f2e243a6ef599ebf144acd +b3a367dad684d94cbe77a80adcc89bf07858d0ad
diff --git a/decoders/build/premake5.lua b/decoders/build/premake5.lua index b9ec487..c1552b9 100644 --- a/decoders/build/premake5.lua +++ b/decoders/build/premake5.lua
@@ -27,6 +27,11 @@ '../src/**.cpp' } + filter { "system:windows" } + do + architecture "x64" + end + filter "configurations:debug" do defines {"DEBUG"}
diff --git a/decoders/src/bitmap_decoder.cpp b/decoders/src/bitmap_decoder.cpp index 48ef58d..d60e8e3 100644 --- a/decoders/src/bitmap_decoder.cpp +++ b/decoders/src/bitmap_decoder.cpp
@@ -44,7 +44,7 @@ struct ImageFormat { const char* name; - std::vector<const uint8_t> fingerprint; + std::vector<uint8_t> fingerprint; BitmapDecoder decodeImage; };
diff --git a/decoders/src/decode_png.cpp b/decoders/src/decode_png.cpp index 58a7a30..a9a0e64 100644 --- a/decoders/src/decode_png.cpp +++ b/decoders/src/decode_png.cpp
@@ -4,6 +4,7 @@ #include "rive/decoders/bitmap_decoder.hpp" #include "png.h" +#include <cassert> #include <algorithm> struct EncodedImageBuffer @@ -57,8 +58,8 @@ EncodedImageBuffer stream = { .bytes = bytes, - .size = byteCount, .position = 0, + .size = byteCount, }; png_set_read_fn(png_ptr, &stream, ReadDataFromMemory);