From: cristy Date: Fri, 15 Aug 2014 12:46:34 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2094 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=260bd76a66605f285ce18bcf938d74a7ac149d52;p=imagemagick --- diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 93fbc135f..4d2b4906d 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -218,7 +218,7 @@ static struct {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, { "Chop", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"x", IntegerReference}, - {"y", IntegerReference} } }, + {"y", IntegerReference}, {"gravity", MagickGravityOptions} } }, { "Crop", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"x", IntegerReference}, {"y", IntegerReference}, {"fuzz", StringReference}, @@ -7920,6 +7920,8 @@ Mogrify(ref,...) } case 7: /* Chop */ { + if (attribute_flag[5] != 0) + image->gravity=(GravityType) argument_list[5].integer_reference; if (attribute_flag[0] != 0) flags=ParseGravityGeometry(image,argument_list[0].string_reference, &geometry,exception); @@ -10058,6 +10060,8 @@ Mogrify(ref,...) } case 87: /* Splice */ { + if (attribute_flag[7] != 0) + image->gravity=(GravityType) argument_list[7].integer_reference; if (attribute_flag[0] != 0) flags=ParseGravityGeometry(image,argument_list[0].string_reference, &geometry,exception); @@ -10075,8 +10079,6 @@ Mogrify(ref,...) if (attribute_flag[6] != 0) (void) QueryColorCompliance(argument_list[6].string_reference, AllCompliance,&image->background_color,exception); - if (attribute_flag[7] != 0) - image->gravity=(GravityType) argument_list[7].integer_reference; image=SpliceImage(image,&geometry,exception); break; } diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in index 7faf828ac..ea8f419d7 100644 --- a/PerlMagick/quantum/quantum.xs.in +++ b/PerlMagick/quantum/quantum.xs.in @@ -218,7 +218,7 @@ static struct {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, { "Chop", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"x", IntegerReference}, - {"y", IntegerReference} } }, + {"y", IntegerReference}, {"gravity", MagickGravityOptions} } }, { "Crop", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"x", IntegerReference}, {"y", IntegerReference}, {"fuzz", StringReference}, @@ -7920,6 +7920,8 @@ Mogrify(ref,...) } case 7: /* Chop */ { + if (attribute_flag[5] != 0) + image->gravity=(GravityType) argument_list[5].integer_reference; if (attribute_flag[0] != 0) flags=ParseGravityGeometry(image,argument_list[0].string_reference, &geometry,exception); @@ -10058,6 +10060,8 @@ Mogrify(ref,...) } case 87: /* Splice */ { + if (attribute_flag[7] != 0) + image->gravity=(GravityType) argument_list[7].integer_reference; if (attribute_flag[0] != 0) flags=ParseGravityGeometry(image,argument_list[0].string_reference, &geometry,exception); @@ -10075,8 +10079,6 @@ Mogrify(ref,...) if (attribute_flag[6] != 0) (void) QueryColorCompliance(argument_list[6].string_reference, AllCompliance,&image->background_color,exception); - if (attribute_flag[7] != 0) - image->gravity=(GravityType) argument_list[7].integer_reference; image=SpliceImage(image,&geometry,exception); break; }