From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 27 Feb 2013 21:01:50 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4f023a2ab15318fea50a4af87f5e874e51a9025;p=imagemagick

---

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 839d57503..1c81f619b 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -949,20 +949,20 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
             {
               case cmsSigRgbData:
               {
-                image->type=image->alpha_trait != BlendPixelTrait ? TrueColorType :
-                  TrueColorMatteType;
+                image->type=image->alpha_trait != BlendPixelTrait ?
+                  TrueColorType : TrueColorMatteType;
                 break;
               }
               case cmsSigCmykData:
               {
-                image->type=image->alpha_trait != BlendPixelTrait ? ColorSeparationType :
-                  ColorSeparationMatteType;
+                image->type=image->alpha_trait != BlendPixelTrait ?
+                  ColorSeparationType : ColorSeparationMatteType;
                 break;
               }
               case cmsSigGrayData:
               {
-                image->type=image->alpha_trait != BlendPixelTrait ? GrayscaleType :
-                  GrayscaleMatteType;
+                image->type=image->alpha_trait != BlendPixelTrait ?
+                  GrayscaleType : GrayscaleMatteType;
                 break;
               }
               default:
diff --git a/coders/tiff.c b/coders/tiff.c
index 0b57bc381..c77f9f83b 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1072,6 +1072,11 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       SetImageColorspace(image,CMYKColorspace,exception);
     if (photometric == PHOTOMETRIC_CIELAB)
       SetImageColorspace(image,LabColorspace,exception);
+    TIFFGetProfiles(tiff,image,exception);
+    TIFFGetProperties(tiff,image,exception);
+    option=GetImageOption(image_info,"tiff:exif-properties");
+    if (IfMagickTrue(IsStringNotFalse(option))) /* enabled by default */
+      TIFFGetEXIFProperties(tiff,image,exception);
     (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_SAMPLESPERPIXEL,
       &samples_per_pixel);
     (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_RESOLUTIONUNIT,&units);
@@ -1152,11 +1157,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       case COMPRESSION_ADOBE_DEFLATE: image->compression=ZipCompression; break;
       default: image->compression=RLECompression; break;
     }
-    TIFFGetProfiles(tiff,image,exception);
-    TIFFGetProperties(tiff,image,exception);
-    option=GetImageOption(image_info,"tiff:exif-properties");
-    if (IfMagickTrue(IsStringNotFalse(option))) /* enabled by default */
-      TIFFGetEXIFProperties(tiff,image,exception);
     /*
       Allocate memory for the image and pixel buffer.
     */