From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 14 May 2010 16:07:28 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9457
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a98aa4096115e86b1bb9d8b54c362dbe1dbbe48;p=imagemagick

---

diff --git a/magick/constitute.c b/magick/constitute.c
index 152cd38a3..5e03300e1 100644
--- a/magick/constitute.c
+++ b/magick/constitute.c
@@ -650,9 +650,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
         (void) DeleteImageProperty(next,"tiff:Orientation");
         (void) DeleteImageProperty(next,"exif:Orientation");
       }
-    value=GetImageProperty(next,"tiff:XResolution");
-    if (value == (char *) NULL)
-      value=GetImageProperty(next,"exif:XResolution");
+    value=GetImageProperty(next,"exif:XResolution");
     if (value != (char *) NULL)
       {
         geometry_info.rho=next->x_resolution;
@@ -661,11 +659,8 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
         if (geometry_info.sigma != 0)
           next->x_resolution=geometry_info.rho/geometry_info.sigma;
         (void) DeleteImageProperty(next,"exif:XResolution");
-        (void) DeleteImageProperty(next,"tiff:XResolution");
       }
-    value=GetImageProperty(next,"tiff:YResolution");
-    if (value == (char *) NULL)
-      value=GetImageProperty(next,"exif:YResolution");
+    value=GetImageProperty(next,"exif:YResolution");
     if (value != (char *) NULL)
       {
         geometry_info.rho=next->y_resolution;
@@ -674,7 +669,6 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
         if (geometry_info.sigma != 0)
           next->y_resolution=geometry_info.rho/geometry_info.sigma;
         (void) DeleteImageProperty(next,"exif:YResolution");
-        (void) DeleteImageProperty(next,"tiff:YResolution");
       }
     value=GetImageProperty(next,"tiff:ResolutionUnit");
     if (value == (char *) NULL)