From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 1 Apr 2012 14:19:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5918
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=946b103292370158321afd50cbacc59dd347b9fc;p=imagemagick

---

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 15db9daf3..175cf150e 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2392,6 +2392,22 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
         }
       break;
     }
+    case 'r':
+    {
+      if (LocaleNCompare("resolution.x",property,11) == 0)
+        {
+          (void) FormatLocaleString(value,MaxTextExtent,"%g",
+            image->resolution.x);
+          break;
+        }
+      if (LocaleNCompare("resolution.y",property,11) == 0)
+        {
+          (void) FormatLocaleString(value,MaxTextExtent,"%g",
+            image->resolution.y);
+          break;
+        }
+      break;
+    }
     case 's':
     {
       if (LocaleNCompare("size",property,4) == 0)
@@ -2474,26 +2490,6 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
         }
       break;
     }
-    case 'x':
-    {
-      if (LocaleNCompare("xresolution",property,11) == 0)
-        {
-          (void) FormatLocaleString(value,MaxTextExtent,"%g",
-            image->resolution.x);
-          break;
-        }
-      break;
-    }
-    case 'y':
-    {
-      if (LocaleNCompare("yresolution",property,11) == 0)
-        {
-          (void) FormatLocaleString(value,MaxTextExtent,"%g",
-            image->resolution.y);
-          break;
-        }
-      break;
-    }
     case 'z':
     {
       if (LocaleNCompare("zero",property,4) == 0)