Allow jpg, bmp and tga files

This commit is contained in:
Maschell 2020-02-18 00:45:08 +01:00
parent 4e23508b0e
commit c9ae9cf218

View File

@ -80,10 +80,10 @@ void GuiImageData::loadImage(const uint8_t *img, int32_t imgSize, GX2TexClampMod
//! not needed for now therefore comment out to safe ELF size //! not needed for now therefore comment out to safe ELF size
//! if needed uncomment, adds 200 kb to the ELF size //! if needed uncomment, adds 200 kb to the ELF size
// IMAGE_JPEG // IMAGE_JPEG
//gdImg = gdImageCreateFromJpegPtr(imgSize, (uint8_t*) img); gdImg = gdImageCreateFromJpegPtr(imgSize, (uint8_t*) img);
} else if (img[0] == 'B' && img[1] == 'M') { } else if (img[0] == 'B' && img[1] == 'M') {
// IMAGE_BMP // IMAGE_BMP
//gdImg = gdImageCreateFromBmpPtr(imgSize, (uint8_t*) img); gdImg = gdImageCreateFromBmpPtr(imgSize, (uint8_t*) img);
} else if (img[0] == 0x89 && img[1] == 'P' && img[2] == 'N' && img[3] == 'G') { } else if (img[0] == 0x89 && img[1] == 'P' && img[2] == 'N' && img[3] == 'G') {
// IMAGE_PNG // IMAGE_PNG
gdImg = gdImageCreateFromPngPtr(imgSize, (uint8_t*) img); gdImg = gdImageCreateFromPngPtr(imgSize, (uint8_t*) img);
@ -91,7 +91,7 @@ void GuiImageData::loadImage(const uint8_t *img, int32_t imgSize, GX2TexClampMod
//!This must be last since it can also intefere with outher formats //!This must be last since it can also intefere with outher formats
else if(img[0] == 0x00) { else if(img[0] == 0x00) {
// Try loading TGA image // Try loading TGA image
//gdImg = gdImageCreateFromTgaPtr(imgSize, (uint8_t*) img); gdImg = gdImageCreateFromTgaPtr(imgSize, (uint8_t*) img);
} }
if(gdImg == 0) if(gdImg == 0)