]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 16 Jun 2011 01:46:57 +0000 (01:46 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 16 Jun 2011 01:46:57 +0000 (01:46 +0000)
magick/identify.c

index 85d7f3d6058f01b28a03f9a31cfc5019154e7f0e..f25e3c6e313bb2138f510e59614e8e1f1f6aa6ef 100644 (file)
@@ -631,15 +631,18 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
             }
         }
       artifact=GetImageArtifact(image,"identify:unique-colors");
-      if ((artifact != (const char *) NULL) &&
-          (IsMagickTrue(artifact) != MagickFalse))
-        (void) FormatLocaleFile(file,"  Colors: %.20g\n",(double)
-          GetNumberColors(image,(FILE *) NULL,&image->exception));
       if (IsHistogramImage(image,&image->exception) != MagickFalse)
         {
+          (void) FormatLocaleFile(file,"  Colors: %.20g\n",(double)
+            GetNumberColors(image,(FILE *) NULL,&image->exception));
           (void) FormatLocaleFile(file,"  Histogram:\n");
           (void) GetNumberColors(image,file,&image->exception);
         }
+      else
+        if ((artifact != (const char *) NULL) &&
+            (IsMagickTrue(artifact) != MagickFalse))
+          (void) FormatLocaleFile(file,"  Colors: %.20g\n",(double)
+            GetNumberColors(image,(FILE *) NULL,&image->exception));
     }
   if (image->storage_class == PseudoClass)
     {