Replace Sadge.png with tsodinCup.png

build.sh

@@ -41,8 +41,8 @@ build_all_vc_demos() {
 
 build_tools() {
     mkdir -p ./build/tools/
-    clang $COMMON_CFLAGS -o ./build/tools/png2c -Ithirdparty ./tools/png2c.c -lm &
-    clang $COMMON_CFLAGS -o ./build/tools/obj2c -Ithirdparty ./tools/obj2c.c -lm &
+    clang $COMMON_CFLAGS -o ./build/tools/png2c ./tools/png2c.c -lm &
+    clang $COMMON_CFLAGS -o ./build/tools/obj2c ./tools/obj2c.c -lm &
     clang $COMMON_CFLAGS -O2 -o ./build/tools/viewobj ./tools/viewobj.c &
     wait # TODO: the whole script must fail if one of the jobs fails
 }
@@ -50,13 +50,13 @@ build_tools() {
 build_assets() {
     mkdir -p ./build/assets/
     ./build/tools/png2c -n tsodinPog -o ./build/assets/tsodinPog.c ./assets/tsodinPog.png &
-    ./build/tools/png2c -n Sadge -o ./build/assets/Sadge.c ./assets/Sadge.png &
+    ./build/tools/png2c -n tsodinCup -o ./build/assets/tsodinCup.c ./assets/tsodinCup.png &
     ./build/tools/obj2c ./assets/tsodinCupLowPoly.obj ./build/assets/tsodinCupLowPoly.c &
     wait # TODO: the whole script must fail if one of the jobs fails
 }
 
 build_tests() {
-    clang $COMMON_CFLAGS -fsanitize=memory -o ./build/test -Ithirdparty ./test.c -lm
+    clang $COMMON_CFLAGS -fsanitize=memory -o ./build/test ./test.c -lm
 }
 
 build_tools

test.c

@@ -6,7 +6,7 @@
 #include <errno.h>
 
 #include "./assets/tsodinPog.c"
-#include "./assets/Sadge.c"
+#include "./assets/tsodinCup.c"
 
 #define PI 3.14159265359
 
@@ -555,13 +555,13 @@ Olivec_Canvas test_sprite_blend_null(void)
 
 Olivec_Canvas test_sprite_blend_vs_copy(void)
 {
-    Olivec_Canvas sadge = olivec_canvas(Sadge_pixels, Sadge_width, Sadge_height, Sadge_width);
-    size_t w = sadge.width;
-    size_t h = sadge.height*2;
+    Olivec_Canvas tsodinCup = olivec_canvas(tsodinCup_pixels, tsodinCup_width, tsodinCup_height, tsodinCup_width);
+    size_t w = tsodinCup.width;
+    size_t h = tsodinCup.height*2;
     Olivec_Canvas dst = canvas_alloc(w, h);
     olivec_fill(dst, RED_COLOR);
-    olivec_sprite_blend(dst, 0, 0, sadge.width, sadge.height, sadge);
-    olivec_sprite_copy(dst, 0, sadge.height, sadge.width, sadge.height, sadge);
+    olivec_sprite_blend(dst, 0, 0, tsodinCup.width, tsodinCup.height, tsodinCup);
+    olivec_sprite_copy(dst, 0, tsodinCup.height, tsodinCup.width, tsodinCup.height, tsodinCup);
     return dst;
 }
 

tools/obj2c.c

@@ -43,7 +43,8 @@ Errno read_entire_file(const char *file_path, char **buffer, size_t *buffer_size
     if (fseek(f, 0, SEEK_SET) < 0) return_defer(errno);
 
     *buffer_size = m;
-    *buffer = context_alloc(*buffer_size);
+    *buffer = context_alloc(*buffer_size + 1);
+    (*buffer)[*buffer_size] = '\0';
 
     fread(*buffer, *buffer_size, 1, f);
     if (ferror(f)) return_defer(errno);

tools/png2c.c

@@ -89,7 +89,7 @@ bool generate_c_file_from_png(const char *input_file_path, const char *output_fi
     }
 
 defer:
-    if (output_file_path) fclose(out);
+    if (out) fclose(out);
     if (data) stbi_image_free(data);
     return result;
 }