From: cristy Date: Mon, 3 Oct 2011 11:31:52 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6913 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1818162e426fa8fc012852934c6a7eac4811c996;p=imagemagick --- diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index a726e1d55..c78cb3537 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -7512,7 +7512,14 @@ Mogrify(ref,...) PixelPacket target; - (void) GetOneVirtualPixel(image,0,0,&target,exception); + Quantum + virtual_pixel[MaxPixelChannels]; + + (void) GetOneVirtualPixel(image,0,0,virtual_pixel,exception); + target.red=virtual_pixel[RedPixelChannel]; + target.green=virtual_pixel[GreenPixelChannel]; + target.blue=virtual_pixel[BluePixelChannel]; + target.alpha=virtual_pixel[AlphaPixelChannel]; if (attribute_flag[0] != 0) (void) QueryColorCompliance(argument_list[0].string_reference, AllCompliance,&target,exception); @@ -8182,6 +8189,9 @@ Mogrify(ref,...) PixelInfo target; + Quantum + virtual_pixel[MaxPixelChannels]; + draw_info=CloneDrawInfo(info ? info->image_info : (ImageInfo *) NULL,(DrawInfo *) NULL); if (attribute_flag[0] != 0) @@ -8194,8 +8204,12 @@ Mogrify(ref,...) if (attribute_flag[3] != 0) (void) QueryColorCompliance(argument_list[3].string_reference, AllCompliance,&draw_info->fill,exception); - (void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y,&target, - exception); + (void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y, + virtual_pixel,exception); + target.red=virtual_pixel[RedPixelChannel]; + target.green=virtual_pixel[GreenPixelChannel]; + target.blue=virtual_pixel[BluePixelChannel]; + target.alpha=virtual_pixel[AlphaPixelChannel]; invert=MagickFalse; if (attribute_flag[4] != 0) { @@ -8743,6 +8757,9 @@ Mogrify(ref,...) PixelInfo target; + Quantum + virtual_pixel[MaxPixelChannels]; + draw_info=CloneDrawInfo(info ? info->image_info : (ImageInfo *) NULL, (DrawInfo *) NULL); if (attribute_flag[0] != 0) @@ -8754,8 +8771,12 @@ Mogrify(ref,...) geometry.y=argument_list[2].integer_reference; if (image->matte == MagickFalse) (void) SetImageAlpha(image,OpaqueAlpha); - (void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y,&target, - exception); + (void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y, + virtual_pixel,exception); + target.red=virtual_pixel[RedPixelChannel]; + target.green=virtual_pixel[GreenPixelChannel]; + target.blue=virtual_pixel[BluePixelChannel]; + target.alpha=virtual_pixel[AlphaPixelChannel]; if (attribute_flag[4] != 0) QueryMagickColorCompliance(argument_list[4].string_reference, AllCompliance,&target,exception); @@ -10219,6 +10240,9 @@ Mogrify(ref,...) PixelInfo target; + Quantum + virtual_pixel[MaxPixelChannels]; + draw_info=CloneDrawInfo(info ? info->image_info : (ImageInfo *) NULL,(DrawInfo *) NULL); if (attribute_flag[0] != 0) @@ -10231,8 +10255,12 @@ Mogrify(ref,...) if (attribute_flag[3] != 0) (void) QueryColorCompliance(argument_list[3].string_reference, AllCompliance,&draw_info->fill,exception); - (void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y,&target, - exception); + (void) GetOneVirtualMagickPixel(image,geometry.x,geometry.y, + virtual_pixel,exception); + target.red=virtual_pixel[RedPixelChannel]; + target.green=virtual_pixel[GreenPixelChannel]; + target.blue=virtual_pixel[BluePixelChannel]; + target.alpha=virtual_pixel[AlphaPixelChannel]; if (attribute_flag[4] != 0) QueryMagickColorCompliance(argument_list[4].string_reference, AllCompliance,&target,exception);