From: glennrp Date: Tue, 6 Sep 2011 17:11:42 +0000 (+0000) Subject: Revised some whitespace in coders/png.c X-Git-Tag: 7.0.1-0~7062 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29a106ed9ec29e243521b0f2a26c14281de8347f;p=imagemagick Revised some whitespace in coders/png.c --- diff --git a/coders/png.c b/coders/png.c index ffdd6ddc1..eaf68d613 100644 --- a/coders/png.c +++ b/coders/png.c @@ -7626,44 +7626,63 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (profile != (StringInfo *) NULL) { if ((LocaleCompare(name,"ICC") == 0) || - (LocaleCompare(name,"ICM") == 0)) - { + (LocaleCompare(name,"ICM") == 0)) + { unsigned char *data; png_uint_32 length; + length=(png_uint_32) GetStringInfoLength(profile); + + if (length == 3144) { - length=(png_uint_32) GetStringInfoLength(profile); + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " got a 3144-byte ICC profile (potentially sRGB)"); - if (length == 3144) - { + data=GetStringInfoDatum(profile); + + if (data[52]=='s' && data[53]=='R' && + data[54]=='G' && data[55]=='B') + { + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " It is the HP-Microsoft sRGB)"); + if (image->rendering_intent==UndefinedIntent); + image->rendering_intent=PerceptualIntent; + } + else (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " got a 3144-byte ICC profile (potentially sRGB)"); + " It is not sRGB (%c%c%c%c)",data[52], + data[53],data[54],data[55]); + + } + else if (length == 3052) + { + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " got a 3052-byte ICC profile (potentially sRGB)"); - data=GetStringInfoDatum(profile); + data=GetStringInfoDatum(profile); - if (data[52]=='s' && data[53]=='R' && - data[54]=='G' && data[55]=='B') - { - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " It is sRGB)"); - if (image->rendering_intent==UndefinedIntent); - image->rendering_intent=PerceptualIntent; - } - else - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " It is not sRGB (%c%c%c%c)",data[52], - data[53],data[54],data[55]); - - } - else - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " got a %lu-byte ICC profile", - (unsigned long) length); + if (data[336]=='s' && data[337]=='R' && + data[338]=='G' && data[339]=='B') + { + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " It is the ICC no-black sRGB)"); + if (image->rendering_intent==UndefinedIntent); + image->rendering_intent=PerceptualIntent; + } + else + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " It is not sRGB (%c%c%c%c)",data[52], + data[53],data[54],data[55]); + } - } + else + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " got a %lu-byte ICC profile", + (unsigned long) length); + } } name=GetNextImageProfile(image); }