ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Util: Add grayscale mImage loading

This commit is contained in:
Vicki Pfau 2023-04-17 02:10:16 -07:00
parent 65f04ee408
commit f8b923015b
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/image.c
View File

@ -132,6 +132,20 @@ static struct mImage* mImageLoadPNG(struct VFile* vf) {
return NULL; return NULL;
} }
break; break;
case 1:
if (png_get_color_type(png, info) == PNG_COLOR_TYPE_GRAY) {
image->format = mCOLOR_L8;
image->depth = 1;
image->data = malloc(width * height);
if (!PNGReadPixels8(png, info, image->data, width, height, width)) {
free(image->data);
free(image);
PNGReadClose(png, info, end);
return NULL;
}
break;
}
// Fall through
default: default:
// Not supported yet // Not supported yet
free(image); free(image);

30
src/util/test/image.c
View File

@ -596,6 +596,35 @@ M_TEST_DEFINE(savePngRoundTrip) {
mImageDestroy(image); mImageDestroy(image);
} }
} }
M_TEST_DEFINE(savePngL8) {
struct mImage* image = mImageCreate(2, 2, mCOLOR_L8);
mImageSetPixel(image, 0, 0, 0xFF000000);
mImageSetPixel(image, 1, 0, 0xFF555555);
mImageSetPixel(image, 0, 1, 0xFFAAAAAA);
mImageSetPixel(image, 1, 1, 0xFFFFFFFF);
assert_int_equal(mImageGetPixel(image, 0, 0), 0xFF000000);
assert_int_equal(mImageGetPixel(image, 1, 0), 0xFF555555);
assert_int_equal(mImageGetPixel(image, 0, 1), 0xFFAAAAAA);
assert_int_equal(mImageGetPixel(image, 1, 1), 0xFFFFFFFF);
struct VFile* vf = VFileMemChunk(NULL, 0);
assert_true(mImageSaveVF(image, vf, "png"));
mImageDestroy(image);
assert_int_equal(vf->seek(vf, 0, SEEK_SET), 0);
assert_true(isPNG(vf));
assert_int_equal(vf->seek(vf, 0, SEEK_SET), 0);
image = mImageLoadVF(vf);
vf->close(vf);
assert_non_null(image);
assert_int_equal(mImageGetPixel(image, 0, 0), 0xFF000000);
assert_int_equal(mImageGetPixel(image, 1, 0), 0xFF555555);
assert_int_equal(mImageGetPixel(image, 0, 1), 0xFFAAAAAA);
assert_int_equal(mImageGetPixel(image, 1, 1), 0xFFFFFFFF);
mImageDestroy(image);
}
#endif #endif
M_TEST_DEFINE(convert1x1) { M_TEST_DEFINE(convert1x1) {
@ -1043,6 +1072,7 @@ M_TEST_SUITE_DEFINE(Image,
cmocka_unit_test(savePngNative), cmocka_unit_test(savePngNative),
cmocka_unit_test(savePngNonNative), cmocka_unit_test(savePngNonNative),
cmocka_unit_test(savePngRoundTrip), cmocka_unit_test(savePngRoundTrip),
cmocka_unit_test(savePngL8),
#endif #endif
cmocka_unit_test(convert1x1), cmocka_unit_test(convert1x1),
cmocka_unit_test(convert2x1), cmocka_unit_test(convert2x1),