Changeset 5495 for ImageMagick/trunk/coders/png.c

Timestamp:

10/03/11 21:21:09 (20 months ago)

Author:

glennrp

Message:

Recognize certain sRGB profiles by their crc32.

File:

• ImageMagick/trunk/coders/png.c (modified) (1 diff)

ImageMagick/trunk/coders/png.c

@@ -7629 +7629 @@
                (LocaleCompare(name,"ICM") == 0))
               {
+                 int
+                   icheck;
+
+                 /* 0: not a known sRGB profile
+                  * 1: HP-Microsoft sRGB v2
+                  * 2: ICC sRGB v4 perceptual
+                  * 3: ICC sRGB v2 perceptual no black-compensation
+                  */
+                 png_uint_32
+                   check_crc[4] = {0, 0xf29e526dUL, 0xbbef7812UL, 0x427ebb21UL},
+                   check_len[4] = {0, 3144, 60960, 3052};
+
+                 png_uint_32
+                   length,
+                   profile_crc;
+
                  unsigned char
                    *data;
 
-                 png_uint_32
-                   length;
-
                  length=(png_uint_32) GetStringInfoLength(profile);
 
-                 if (length == 3144)
+                 for (icheck=3; icheck > 0; icheck--)
                  {
-                   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                       "    got a 3144-byte ICC profile (potentially sRGB)");
-
-                   data=GetStringInfoDatum(profile);
-
-                   if (data[52]=='s' && data[53]=='R' &&
-                       data[54]=='G' && data[55]=='B')
+                   if (length == check_len[icheck])
                    {
-                      (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                          "    It is the HP-Microsoft sRGB)");
-                      if (image->rendering_intent==UndefinedIntent)
-                        image->rendering_intent=PerceptualIntent;
+                     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+                         "    Got a %lu-byte ICC profile (potentially sRGB)",
+                         (unsigned long) length);
+
+                     data=GetStringInfoDatum(profile);
+                     profile_crc=crc32(0,data,length);
+
+                     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+                         "      with crc=%8x",profile_crc);
+
+                     if (profile_crc == check_crc[icheck])
+                     {
+                        (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+                            "      It is sRGB.");
+                        if (image->rendering_intent==UndefinedIntent)
+                          image->rendering_intent=PerceptualIntent;
+                        break;
+                     }
                    }
-                   else
-                      (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                          "    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);
-
-                   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
+                 if (icheck == 0)
                     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-                        "    got a %lu-byte ICC profile",
+                        "    Got a %lu-byte ICC profile",
                         (unsigned long) length);
               }