[master] Imported from libpng-1.6.33.tar

This commit is contained in:
Glenn Randers-Pehrson
2017-09-28 13:57:00 -05:00
parent f8110669f0
commit c1effe1bbf
71 changed files with 531 additions and 219 deletions

View File

@@ -1940,7 +1940,7 @@ png_image_write_main(png_voidp argument)
int colormap = (format & PNG_FORMAT_FLAG_COLORMAP);
int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */
int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA);
int write_16bit = linear && !colormap && (display->convert_to_8bit == 0);
int write_16bit = linear && (display->convert_to_8bit == 0);
# ifdef PNG_BENIGN_ERRORS_SUPPORTED
/* Make sure we error out on any bad situation */