timoreo/quirc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18 from czarkoff/png

Browse source 
Fix png image handling
This commit is contained in:
Daniel Beer 2016-08-16 09:36:49 +12:00 committed by GitHub
commit 5b26248009
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/dbgutil.c
View file

@ -192,6 +192,7 @@ out:
int load_png(struct quirc *q, const char *filename) int load_png(struct quirc *q, const char *filename)
{ {
int width, height, rowbytes, interlace_type, number_passes = 1; int width, height, rowbytes, interlace_type, number_passes = 1;
png_uint_32 trns;
png_byte color_type, bit_depth; png_byte color_type, bit_depth;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
@ -229,13 +230,13 @@ int load_png(struct quirc *q, const char *filename)
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
png_set_expand_gray_1_2_4_to_8(png_ptr); png_set_expand_gray_1_2_4_to_8(png_ptr);
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) if ((trns = png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
png_set_tRNS_to_alpha(png_ptr); png_set_tRNS_to_alpha(png_ptr);
if (bit_depth == 16) if (bit_depth == 16)
png_set_strip_16(png_ptr); png_set_scale_16(png_ptr);
if (color_type & PNG_COLOR_MASK_ALPHA) if ((trns) || color_type & PNG_COLOR_MASK_ALPHA)
png_set_strip_alpha(png_ptr); png_set_strip_alpha(png_ptr);
if (color_type == PNG_COLOR_TYPE_PALETTE) if (color_type == PNG_COLOR_TYPE_PALETTE)