diff options
| author | John Bowler <jbowler@acm.org> | 2012-09-04 11:19:00 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-09-04 16:35:20 -0500 |
| commit | b98681b49a8f3d47191b5b292ebd0ac6dc7c165d (patch) | |
| tree | 6e20c6f46ac5a7e907c4f56ada9920cd8ac2cb30 /pngrutil.c | |
| parent | 53f7051b1bfc57011b279e7fb8e351bbdfd411f3 (diff) | |
| download | libpng-b98681b49a8f3d47191b5b292ebd0ac6dc7c165d.tar.gz | |
[libpng16] Improved ICC profile handling including cHRM chunk generation and
fixed Cygwin+MSVC build errors. The ICC profile handling now includes more
checking. Several errors that caused rejection of the profile are now
handled with a warning in such a way that the invalid profiles will be
read by default in release (but not pre-RC) builds but will not be
written by default. The easy part of handling a cHRM chunk is written,
where the ICC profile contains the required data. The more difficult
part plus guessing a gAMA value requires code to pass selected RGB values
through the profile.
Diffstat (limited to 'pngrutil.c')
| -rw-r--r-- | pngrutil.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pngrutil.c b/pngrutil.c index b6dd2e500..83a580497 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1495,8 +1495,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) */ ok = png_icc_set_gAMA_and_cHRM(png_ptr, &png_ptr->colorspace, keyword, profile, - png_ptr->zstream.adler, - 0/*prefer explicit gAMA/cHRM*/); + png_ptr->zstream.adler); /* Steal the profile for info_ptr. */ if (ok && info_ptr != NULL) |