]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 14 May 2010 16:07:28 +0000 (16:07 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 14 May 2010 16:07:28 +0000 (16:07 +0000)
magick/constitute.c

index 152cd38a37d8e46de856b4fc98d5038831ee9a5a..5e03300e1fdf7a537c0f6ce6c8096e65667afab7 100644 (file)
@@ -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)