update ncnn, stb, fix grayscale decoding, fix #94

nihui · Jul 29, 2020 · 57a709e · 57a709e
1 parent a0e5087
commit 57a709e
Show file tree

Hide file tree

Showing 4 changed files with 506 additions and 221 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -250,12 +250,14 @@ void* load(void* args)
                             // grayscale -> rgb
                             stbi_image_free(pixeldata);
                             pixeldata = stbi_load_from_memory(filedata, length, &w, &h, &c, 3);
+                            c = 3;
                         }
                         else if (c == 2)
                         {
                             // grayscale + alpha -> rgba
                             stbi_image_free(pixeldata);
                             pixeldata = stbi_load_from_memory(filedata, length, &w, &h, &c, 4);
+                            c = 4;
                         }
                     }
 #endif // _WIN32

diff --git a/src/ncnn b/src/ncnn