From 4b4358face0863704f63dcb98cb6f0bba53d1dcc Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 7 Feb 2012 02:45:46 +0000 Subject: [PATCH] --- MagickCore/distort.c | 2 +- PerlMagick/Magick.xs | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/MagickCore/distort.c b/MagickCore/distort.c index e02d4a6d8..a25096054 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2276,7 +2276,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, } distort_image->page.x=geometry.x; distort_image->page.y=geometry.y; - if (distort_image->background_color.alpha != OpaqueAlpha) + if (distort_image->background_color.matte != MagickFalse) distort_image->matte=MagickTrue; { /* ----- MAIN CODE ----- diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index b00d7c09f..cdf22dce4 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -247,8 +247,8 @@ static struct {"channel", MagickChannelOptions} } }, { "Roll", { {"geometry", StringReference}, {"x", IntegerReference}, {"y", IntegerReference} } }, - { "Rotate", { {"degrees", RealReference}, {"fill", StringReference}, - {"color", StringReference}, {"background", StringReference} } }, + { "Rotate", { {"degrees", RealReference}, + {"background", StringReference} } }, { "Sample", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference} } }, { "Scale", { {"geometry", StringReference}, {"width", IntegerReference}, @@ -7824,14 +7824,13 @@ Mogrify(ref,...) if (attribute_flag[0] == 0) argument_list[0].real_reference=90.0; if (attribute_flag[1] != 0) - QueryColorCompliance(argument_list[1].string_reference, - AllCompliance,&image->background_color,exception); - if (attribute_flag[2] != 0) - QueryColorCompliance(argument_list[2].string_reference, - AllCompliance,&image->background_color,exception); - if (attribute_flag[3] != 0) - QueryColorCompliance(argument_list[3].string_reference, - AllCompliance,&image->background_color,exception); + { + QueryColorCompliance(argument_list[1].string_reference, + AllCompliance,&image->background_color,exception); + if ((image->background_color.matte != MagickFalse) && + (image->matte == MagickFalse)) + (void) SetImageAlpha(image,OpaqueAlpha,exception); + } image=RotateImage(image,argument_list[0].real_reference,exception); break; } -- 2.40.0