[libpng16] Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose()

in pngrtran.c (Domani Hannes).
This commit is contained in:
Glenn Randers-Pehrson
2012-10-24 11:22:35 -05:00
parent a9f44be8c2
commit 9a82547afe
3 changed files with 9 additions and 5 deletions

View File

@@ -3968,7 +3968,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
*sp = (png_byte)png_ptr->background.gray;
else if (a < 0xff)
png_composite(*sp, *sp, a, png_ptr->background_1.gray);
png_composite(*sp, *sp, a, png_ptr->background.gray);
}
}
}
@@ -4037,7 +4037,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
png_uint_16 g, v;
g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
png_composite_16(v, g, a, png_ptr->background_1.gray);
png_composite_16(v, g, a, png_ptr->background.gray);
*sp = (png_byte)((v >> 8) & 0xff);
*(sp + 1) = (png_byte)(v & 0xff);
}