Merge branch 'master' of github.com:SpartanJ/SOIL2

SpartanJ · SpartanJ · commit 111822e01ab3 · 2025-03-17T16:56:33.000-03:00
diff --git a/.ecode/project_build.json b/.ecode/project_build.json
@@ -0,0 +1,110 @@
+{
+  "SOIL2-premake4": {
+    "build": [
+      {
+        "args": "gmake",
+        "command": "premake4",
+        "working_dir": ""
+      },
+      {
+        "args": "-C make/${os} -j${nproc} config=${build_type}",
+        "command": "make",
+        "working_dir": ""
+      }
+    ],
+    "build_types": [
+      "debug",
+      "release"
+    ],
+    "clean": [
+      {
+        "args": "",
+        "command": "",
+        "working_dir": ""
+      }
+    ],
+    "config": {
+      "clear_sys_env": false
+    },
+    "os": [
+      "freebsd",
+      "haiku",
+      "linux",
+      "macos",
+      "windows"
+    ],
+    "output_parser": {
+      "config": {
+        "relative_file_paths": true
+      }
+    },
+    "run": [
+      {
+        "args": "",
+        "command": "${project_root}/bin/soil2-test-debug",
+        "name": "soil2-test-debug",
+        "working_dir": "${project_root}/bin/"
+      },
+      {
+        "args": "",
+        "command": "${project_root}/bin/soil2-test",
+        "name": "soil2-test",
+        "working_dir": "${project_root}/bin/"
+      }
+    ]
+  },
+  "SOIL2-premake5": {
+    "build": [
+      {
+        "args": "gmake",
+        "command": "premake5",
+        "working_dir": ""
+      },
+      {
+        "args": "-C make/${os} -j${nproc} config=${build_type}_${arch}",
+        "command": "make",
+        "working_dir": ""
+      }
+    ],
+    "build_types": [
+      "debug",
+      "release"
+    ],
+    "clean": [
+      {
+        "args": "",
+        "command": "",
+        "working_dir": ""
+      }
+    ],
+    "config": {
+      "clear_sys_env": false
+    },
+    "os": [
+      "freebsd",
+      "haiku",
+      "linux",
+      "macos",
+      "windows"
+    ],
+    "output_parser": {
+      "config": {
+        "relative_file_paths": true
+      }
+    },
+    "run": [
+      {
+        "args": "",
+        "command": "${project_root}/bin/soil2-test-debug",
+        "name": "soil2-test-debug",
+        "working_dir": "${project_root}/bin/"
+      },
+      {
+        "args": "",
+        "command": "${project_root}/bin/soil2-test",
+        "name": "soil2-test",
+        "working_dir": "${project_root}/bin/"
+      }
+    ]
+  }
+}
diff --git a/src/SOIL2/SOIL2.c b/src/SOIL2/SOIL2.c
@@ -2125,6 +2125,10 @@ SOIL_write_image_to_memory_quality
 	{
 		save_result = stbi_write_jpg_to_func(write_to_memory, &context, width, height, channels, (const unsigned char*)data, quality);
 	}
+	else if (image_type == SOIL_SAVE_TYPE_QOI)
+	{
+		save_result = stbi_write_qoi_to_func(write_to_memory, &context, width, height, channels, (const unsigned char*)data);
+	}
 	else
 	{
 		save_result = 0;
diff --git a/src/SOIL2/stb_image.h b/src/SOIL2/stb_image.h
@@ -1815,6 +1815,7 @@ static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int r
    int i,j;
    unsigned char *good;
 
+   if (data == NULL) return data;
    if (req_comp == img_n) return data;
    STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
 
@@ -1872,6 +1873,7 @@ static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int r
    int i,j;
    stbi__uint16 *good;
 
+   if (data == NULL) return data;
    if (req_comp == img_n) return data;
    STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
 

Original file line number	Diff line number	Diff line change
`@@ -2125,6 +2125,10 @@ SOIL_write_image_to_memory_quality`
`2125`	`2125`	`{`
`2126`	`2126`	`save_result = stbi_write_jpg_to_func(write_to_memory, &context, width, height, channels, (const unsigned char*)data, quality);`
`2127`	`2127`	`}`
	`2128`	`+ else if (image_type == SOIL_SAVE_TYPE_QOI)`
	`2129`	`+ {`
	`2130`	`+ save_result = stbi_write_qoi_to_func(write_to_memory, &context, width, height, channels, (const unsigned char*)data);`
	`2131`	`+ }`
`2128`	`2132`	`else`
`2129`	`2133`	`{`
`2130`	`2134`	`save_result = 0;`