From 10d5541e09a49bab43e9f2ee38fd875d101c605b Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 13 Feb 2015 21:52:54 +0000 Subject: [PATCH] --- MagickCore/property.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/MagickCore/property.c b/MagickCore/property.c index 496ab7405..4249022b1 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -2653,8 +2653,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, { case 'b': { - if ((LocaleCompare("base",property) == 0) || - (LocaleCompare("basename",property) == 0) ) + if (LocaleCompare("basename",property) == 0) { WarnNoImageReturn("\"%%[%s]\"",property); GetPathComponent(image->magick_filename,BasePath,value); @@ -2801,7 +2800,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, string=image->magick; break; } - if (LocaleCompare("maxima",property) == 0) + if (LocaleCompare("max",property) == 0) { double maximum, @@ -2825,7 +2824,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, GetMagickPrecision(),mean); break; } - if (LocaleCompare("minima",property) == 0) + if (LocaleCompare("min",property) == 0) { double maximum, @@ -2977,8 +2976,7 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, GetMagickPrecision(),skewness); break; } - if ((LocaleCompare("standard-deviation",property) == 0) || - (LocaleCompare("standard_deviation",property) == 0)) + if (LocaleCompare("standard-deviation",property) == 0) { double mean, @@ -3041,30 +3039,6 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info, } break; } - case 'x': /* FUTURE: Obsolete X resolution */ - { - if ((LocaleCompare("xresolution",property) == 0) || - (LocaleCompare("x-resolution",property) == 0) ) - { - WarnNoImageReturn("\"%%[%s]\"",property); - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", - image->resolution.x); - break; - } - break; - } - case 'y': /* FUTURE: Obsolete Y resolution */ - { - if ((LocaleCompare("yresolution",property) == 0) || - (LocaleCompare("y-resolution",property) == 0) ) - { - WarnNoImageReturn("\"%%[%s]\"",property); - (void) FormatLocaleString(value,MaxTextExtent,"%.20g", - image->resolution.y); - break; - } - break; - } case 'z': { if (LocaleCompare("zero",property) == 0) -- 2.50.1