Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make PNG loader a little less picky about the PNG format being exactly correct. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2273 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-07-29 17:42:22 +00:00
parent 464e580967
commit 9c6c62ff7f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ivis_common/png_util.c
View File

@ -141,7 +141,7 @@ BOOL iV_loadImage_PNG(const char *fileName, iV_Image *image)
// Filler is, however, for an unknown reason required for tertilesc[23]
/* tell libpng to strip 16 bit/color files down to 8 bits/color */
// png_set_strip_16(png_ptr);
png_set_strip_16(png_ptr);
/* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
* byte into separate bytes (useful for paletted and grayscale images).
@ -150,15 +150,13 @@ BOOL iV_loadImage_PNG(const char *fileName, iV_Image *image)
/* More transformations to ensure we end up with 32bpp, 4 channel RGBA */
// png_set_gray_to_rgb(png_ptr);
// png_set_palette_to_rgb(png_ptr);
// png_set_tRNS_to_alpha(png_ptr);
png_set_palette_to_rgb(png_ptr);
png_set_tRNS_to_alpha(png_ptr);
png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
// png_set_gray_1_2_4_to_8(png_ptr);
png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
image->width = info_ptr->width;
image->height = info_ptr->height;
image->depth = info_ptr->channels;