added QOI image loading support

FosterFramework · Oct 1, 2023 · 859503e · 859503e
1 parent 4e57617
commit 859503e
Show file tree

Hide file tree

Showing 4 changed files with 725 additions and 23 deletions.
diff --git a/Platform/CMakeLists.txt b/Platform/CMakeLists.txt
@@ -14,6 +14,7 @@ endif()
 
 add_library(FosterPlatform SHARED
 	src/foster_platform.c
+	src/foster_image.c
 	src/foster_renderer.c
 	src/foster_renderer_d3d11.c
 	src/foster_renderer_opengl.c

diff --git a/Platform/src/foster_image.c b/Platform/src/foster_image.c
@@ -0,0 +1,75 @@
+#include "foster_platform.h"
+#include "foster_internal.h"
+#include <SDL.h>
+
+#define STB_IMAGE_IMPLEMENTATION
+#include "third_party/stb_image.h"
+
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "third_party/stb_image_write.h"
+
+#define QOI_NO_STDIO
+#define QOI_IMPLEMENTATION
+#define QOI_MALLOC(sz) STBI_MALLOC(sz)
+#define QOI_FREE(p) STBI_FREE(p) 
+#include "third_party/qoi.h"
+
+bool FosterImage_TestQOI(const unsigned char* data, int length);
+unsigned char* FosterImage_LoadQOI(const unsigned char* data, int length, int* w, int * h);
+
+unsigned char* FosterImageLoad(const unsigned char* data, int length, int* w, int* h)
+{
+	// Test for QOI image first
+	if (FosterImage_TestQOI(data, length))
+	{
+		return FosterImage_LoadQOI(data, length, w, h);
+	}
+	// fallback to normal stb image loading (png, bmp, etc)
+	else
+	{
+		int c;
+		return stbi_load_from_memory(data, length, w, h, &c, 4);
+	}
+}
+
+void FosterImageFree(unsigned char* data)
+{
+	stbi_image_free(data);
+}
+
+bool FosterImageWrite(FosterWriteFn* func, void* context, int w, int h, const void* data)
+{
+	// note: 'FosterWriteFn' and 'stbi_write_func' must be the same
+	return stbi_write_png_to_func((stbi_write_func*)func, context, w, h, 4, data, w * 4) != 0;
+}
+
+bool FosterImage_TestQOI(const unsigned char* data, int length)
+{
+	if (length < 4)
+		return false;
+
+	for (int i = 0; i < SDL_max(4, length); i ++)
+		if (data[i] != "qoif"[i])
+			return false;
+
+	return true;
+}
+
+unsigned char* FosterImage_LoadQOI(const unsigned char* data, int length, int* w, int * h)
+{
+	qoi_desc desc;
+	void* result = qoi_decode(data, length, &desc, 4);
+
+	if (result != NULL)
+	{
+		*w = desc.width;
+		*h = desc.height;
+		return result;
+	}
+	else
+	{
+		*w = 0;
+		*h = 0;
+		return NULL;
+	}
+}
diff --git a/Platform/src/foster_platform.c b/Platform/src/foster_platform.c
@@ -3,12 +3,6 @@
 #include "foster_internal.h"
 #include <SDL.h>
 
-#define STB_IMAGE_IMPLEMENTATION
-#include "third_party/stb_image.h"
-
-#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "third_party/stb_image_write.h"
-
 #define STBTT_STATIC
 #define STB_TRUETYPE_IMPLEMENTATION
 #include "third_party/stb_truetype.h"
@@ -412,23 +406,6 @@ bool FosterGetFocused()
 	return (flags & (SDL_WINDOW_INPUT_FOCUS | SDL_WINDOW_MOUSE_FOCUS)) != 0;
 }
 
-unsigned char* FosterImageLoad(const unsigned char* memory, int length, int* w, int* h)
-{
-    int c;
-    return stbi_load_from_memory(memory, length, w, h, &c, 4);
-}
-
-void FosterImageFree(unsigned char* data)
-{
-    stbi_image_free(data);
-}
-
-bool FosterImageWrite(FosterWriteFn* func, void* context, int w, int h, const void* data)
-{
-	// note: 'FosterWriteFn' and 'stbi_write_func' must be the same
-    return stbi_write_png_to_func((stbi_write_func*)func, context, w, h, 4, data, w * 4) != 0;
-}
-
 FosterFont* FosterFontInit(unsigned char* data, int length)
 {
 	stbtt_fontinfo* info = (stbtt_fontinfo*)SDL_malloc(sizeof(stbtt_fontinfo));