From 6b9077c46dea39c0588299ac0d91bdee0a3a3c88 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 5 Dec 2009 02:09:36 +0000 Subject: [PATCH] --- PerlMagick/Magick.xs | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 2fc501cec..88a2e7a35 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -4122,18 +4122,6 @@ Get(ref,...) PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; } - if (LocaleCompare(attribute,"dispose") == 0) - { - if (image == (Image *) NULL) - break; - - s=newSViv(image->dispose); - (void) sv_setpv(s, - MagickOptionToMnemonic(MagickDisposeOptions,image->dispose)); - SvIOK_on(s); - PUSHs(s ? sv_2mortal(s) : &sv_undef); - continue; - } if (LocaleCompare(attribute,"delay") == 0) { if (image != (Image *) NULL) @@ -4149,6 +4137,25 @@ Get(ref,...) PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; } + if (LocaleCompare(attribute,"directory") == 0) + { + if (image && image->directory) + s=newSVpv(image->directory,0); + PUSHs(s ? sv_2mortal(s) : &sv_undef); + continue; + } + if (LocaleCompare(attribute,"dispose") == 0) + { + if (image == (Image *) NULL) + break; + + s=newSViv(image->dispose); + (void) sv_setpv(s, + MagickOptionToMnemonic(MagickDisposeOptions,image->dispose)); + SvIOK_on(s); + PUSHs(s ? sv_2mortal(s) : &sv_undef); + continue; + } if (LocaleCompare(attribute,"disk") == 0) { s=newSViv(GetMagickResource(DiskResource)); @@ -4169,13 +4176,6 @@ Get(ref,...) PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; } - if (LocaleCompare(attribute,"directory") == 0) - { - if (image && image->directory) - s=newSVpv(image->directory,0); - PUSHs(s ? sv_2mortal(s) : &sv_undef); - continue; - } ThrowPerlException(exception,OptionError,"UnrecognizedAttribute", attribute); break; @@ -4537,16 +4537,6 @@ Get(ref,...) PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; } - if (LocaleCompare(attribute,"monochrome") == 0) - { - if (image == (Image *) NULL) - continue; - j=info ? info->image_info->monochrome : - IsMonochromeImage(image,&image->exception); - s=newSViv(j); - PUSHs(s ? sv_2mortal(s) : &sv_undef); - continue; - } if (LocaleCompare(attribute,"mattecolor") == 0) { if (image == (Image *) NULL) @@ -4566,13 +4556,6 @@ Get(ref,...) PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; } - if (LocaleCompare(attribute,"montage") == 0) - { - if (image && image->montage) - s=newSVpv(image->montage,0); - PUSHs(s ? sv_2mortal(s) : &sv_undef); - continue; - } if (LocaleCompare(attribute,"mime") == 0) { const char @@ -4595,6 +4578,23 @@ Get(ref,...) PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; } + if (LocaleCompare(attribute,"monochrome") == 0) + { + if (image == (Image *) NULL) + continue; + j=info ? info->image_info->monochrome : + IsMonochromeImage(image,&image->exception); + s=newSViv(j); + PUSHs(s ? sv_2mortal(s) : &sv_undef); + continue; + } + if (LocaleCompare(attribute,"montage") == 0) + { + if (image && image->montage) + s=newSVpv(image->montage,0); + PUSHs(s ? sv_2mortal(s) : &sv_undef); + continue; + } ThrowPerlException(exception,OptionError,"UnrecognizedAttribute", attribute); break; -- 2.40.0