liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract embedded ICC profile from PNG images

Browse Source 
Fixes #4260
This commit is contained in:
Alberto Griggio 2017-12-27 22:55:00 +01:00
parent a31f52213d
commit 0e9aab579e
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtengine/imageio.cc
View File

@ -308,6 +308,11 @@ int ImageIO::loadPNG (Glib::ustring fname)
return IMIO_HEADERERROR; return IMIO_HEADERERROR;
} }
// silence the warning about "invalid" sRGB profiles -- see #4260
#if defined(PNG_SKIP_sRGB_CHECK_PROFILE) && defined(PNG_SET_OPTION_SUPPORTED)
png_set_option(png, PNG_SKIP_sRGB_CHECK_PROFILE, PNG_OPTION_ON);
#endif
png_infop info = png_create_info_struct (png); png_infop info = png_create_info_struct (png);
png_infop end_info = png_create_info_struct (png); png_infop end_info = png_create_info_struct (png);
@ -356,6 +361,22 @@ int ImageIO::loadPNG (Glib::ustring fname)
png_set_strip_alpha(png); png_set_strip_alpha(png);
} }
// reading the embedded ICC profile if any
if (png_get_valid(png, info, PNG_INFO_iCCP)) {
png_charp name;
int compression_type;
#if PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR > 4)
png_bytep profdata;
#else
png_charp profdata;
#endif
png_uint_32 proflen;
png_get_iCCP(png, info, &name, &compression_type, &profdata, &proflen);
embProfile = cmsOpenProfileFromMem(profdata, proflen);
loadedProfileData = new char[proflen];
memcpy(loadedProfileData, profdata, proflen);
}
//setting gamma //setting gamma
double gamma; double gamma;