Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 645519 - Firefox-4.0 compile fails if "--with-system-png" is ON; r=joe

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2011-03-28 20:14:00 -04:00
parent f5ce31ccb8
commit 5d80ba3f4a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/libpr0n/decoders/nsPNGDecoder.cpp
View File

@ -386,13 +386,24 @@ PNGGetColorProfile(png_structp png_ptr, png_infop info_ptr,
// First try to see if iCCP chunk is present
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
png_uint_32 profileLen;
#if (PNG_LIBPNG_VER < 10500)
char *profileData, *profileName;
#else
png_bytep profileData;
png_charp profileName;
#endif
int compression;
png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
&profileData, &profileLen);
profile = qcms_profile_from_memory(profileData, profileLen);
profile = qcms_profile_from_memory(
#if (PNG_LIBPNG_VER < 10500)
profileData,
#else
(char *)profileData,
#endif
profileLen);
if (profile) {
PRUint32 profileSpace = qcms_profile_get_color_space(profile);