From 571b6c5dce6b851bcd09d5a5bb92634a3c252439 Mon Sep 17 00:00:00 2001 From: Cristy Date: Tue, 15 May 2018 20:30:32 -0400 Subject: [PATCH] ... --- PerlMagick/quantum/quantum.xs.in | 108 ++++++++++++++++--------------- 1 file changed, 57 insertions(+), 51 deletions(-) diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in index fa9035ee3..7676b4ace 100644 --- a/PerlMagick/quantum/quantum.xs.in +++ b/PerlMagick/quantum/quantum.xs.in @@ -7868,7 +7868,8 @@ Mogrify(ref,...) MagickFalse,SvPV(sv,na)); if (pp->type == MagickChannelOptions) al->integer_reference=ParseChannelOption(SvPV(sv,na)); - if ((al->integer_reference < 0) && ((al->integer_reference=SvIV(sv)) <= 0)) + if ((al->integer_reference < 0) && + ((al->integer_reference=SvIV(sv)) <= 0)) { (void) FormatLocaleString(message,MagickPathExtent, "invalid %.60s value",pp->method); @@ -7895,7 +7896,8 @@ Mogrify(ref,...) { default: { - (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) ix); + (void) FormatLocaleString(message,MagickPathExtent,"%.20g",(double) + ix); ThrowPerlException(exception,OptionError, "UnrecognizedPerlMagickMethod",message); goto PerlException; @@ -7942,8 +7944,8 @@ Mogrify(ref,...) PixelInfo target; - (void) GetOneVirtualPixelInfo(image,UndefinedVirtualPixelMethod, - 0,0,&target,exception); + (void) GetOneVirtualPixelInfo(image,UndefinedVirtualPixelMethod,0,0, + &target,exception); if (attribute_flag[0] != 0) (void) QueryColorCompliance(argument_list[0].string_reference, AllCompliance,&target,exception); @@ -8557,8 +8559,9 @@ Mogrify(ref,...) draw_info->stroke_width=argument_list[17].real_reference; if (attribute_flag[18] != 0) { - draw_info->text_antialias=argument_list[18].integer_reference != 0 ? - MagickTrue : MagickFalse; + draw_info->text_antialias= + argument_list[18].integer_reference != 0 ? MagickTrue : + MagickFalse; draw_info->stroke_antialias=draw_info->text_antialias; } if (attribute_flag[19] != 0) @@ -8567,7 +8570,8 @@ Mogrify(ref,...) if (attribute_flag[20] != 0) draw_info->style=(StyleType) argument_list[20].integer_reference; if (attribute_flag[21] != 0) - draw_info->stretch=(StretchType) argument_list[21].integer_reference; + draw_info->stretch=(StretchType) + argument_list[21].integer_reference; if (attribute_flag[22] != 0) draw_info->weight=argument_list[22].integer_reference; if (attribute_flag[23] != 0) @@ -8702,7 +8706,8 @@ Mogrify(ref,...) 1.0); if (composite_image->alpha_trait != UndefinedPixelTrait) (void) SetImageAlpha(composite_image,OpaqueAlpha,exception); - composite_view=AcquireAuthenticCacheView(composite_image,exception); + composite_view=AcquireAuthenticCacheView(composite_image, + exception); for (y=0; y < (ssize_t) composite_image->rows ; y++) { q=GetCacheViewAuthenticPixels(composite_view,0,y,(ssize_t) @@ -8897,8 +8902,9 @@ Mogrify(ref,...) (void) CloneString(&draw_info->primitive, argument_list[0].string_reference); else - (void) CloneString(&draw_info->primitive,CommandOptionToMnemonic( - MagickPrimitiveOptions,argument_list[0].integer_reference)); + (void) CloneString(&draw_info->primitive, + CommandOptionToMnemonic(MagickPrimitiveOptions, + argument_list[0].integer_reference)); } if (attribute_flag[1] != 0) { @@ -9060,8 +9066,9 @@ Mogrify(ref,...) draw_info->pointsize=argument_list[16].real_reference; if (attribute_flag[17] != 0) { - draw_info->stroke_antialias=argument_list[17].integer_reference != 0 - ? MagickTrue : MagickFalse; + draw_info->stroke_antialias= + argument_list[17].integer_reference != 0 ? MagickTrue : + MagickFalse; draw_info->text_antialias=draw_info->stroke_antialias; } if (attribute_flag[18] != 0) @@ -9254,8 +9261,9 @@ Mogrify(ref,...) geometry_info.rho=argument_list[6].real_reference; SetImageArtifact(image,"modulate:colorspace","HWB"); } - (void) FormatLocaleString(modulate,MagickPathExtent,"%.20g,%.20g,%.20g", - geometry_info.rho,geometry_info.sigma,geometry_info.xi); + (void) FormatLocaleString(modulate,MagickPathExtent, + "%.20g,%.20g,%.20g",geometry_info.rho,geometry_info.sigma, + geometry_info.xi); (void) ModulateImage(image,modulate,exception); break; } @@ -9334,7 +9342,8 @@ Mogrify(ref,...) argument_list[3].integer_reference; if (attribute_flag[4] != 0) quantize_info->measure_error= - argument_list[4].integer_reference != 0 ? MagickTrue : MagickFalse; + argument_list[4].integer_reference != 0 ? MagickTrue : + MagickFalse; if (attribute_flag[6] != 0) (void) QueryColorCompliance(argument_list[6].string_reference, AllCompliance,&image->transparent_color,exception); @@ -9400,8 +9409,8 @@ Mogrify(ref,...) if (attribute_flag[3] != 0) colorspace=(ColorspaceType) argument_list[3].integer_reference; if (attribute_flag[4] != 0) - verbose=argument_list[4].integer_reference != 0 ? - MagickTrue : MagickFalse; + verbose=argument_list[4].integer_reference != 0 ? MagickTrue : + MagickFalse; (void) SegmentImage(image,colorspace,verbose,cluster_threshold, smoothing_threshold,exception); break; @@ -9691,7 +9700,8 @@ Mogrify(ref,...) argument_list[2].integer_reference; if (attribute_flag[3] != 0) image->black_point_compensation= - argument_list[3].integer_reference != 0 ? MagickTrue : MagickFalse; + argument_list[3].integer_reference != 0 ? MagickTrue : + MagickFalse; if (attribute_flag[1] != 0) { if (argument_list[1].length == 0) @@ -9717,8 +9727,8 @@ Mogrify(ref,...) /* Associate a profile with the image. */ - profile_info=CloneImageInfo(info ? info->image_info : - (ImageInfo *) NULL); + profile_info=CloneImageInfo(info ? info->image_info : (ImageInfo *) + NULL); profile_image=ReadImages(profile_info,name,exception); if (profile_image == (Image *) NULL) break; @@ -9979,10 +9989,10 @@ Mogrify(ref,...) draw_info->affine.rx=current.rx*affine.sx+current.sy*affine.rx; draw_info->affine.ry=current.sx*affine.ry+current.ry*affine.sy; draw_info->affine.sy=current.rx*affine.ry+current.sy*affine.sy; - draw_info->affine.tx= - current.sx*affine.tx+current.ry*affine.ty+current.tx; - draw_info->affine.ty= - current.rx*affine.tx+current.sy*affine.ty+current.ty; + draw_info->affine.tx=current.sx*affine.tx+current.ry*affine.ty+ + current.tx; + draw_info->affine.ty=current.rx*affine.tx+current.sy*affine.ty+ + current.ty; } if (attribute_flag[6] != 0) image->interpolate=(PixelInterpolateMethod) @@ -10101,10 +10111,8 @@ Mogrify(ref,...) case 82: /* RotationalBlur */ { if (attribute_flag[0] != 0) - { - flags=ParseGeometry(argument_list[0].string_reference, - &geometry_info); - } + flags=ParseGeometry(argument_list[0].string_reference, + &geometry_info); if (attribute_flag[1] != 0) geometry_info.rho=argument_list[1].real_reference; if (attribute_flag[2] != 0) @@ -10233,8 +10241,7 @@ Mogrify(ref,...) { if (attribute_flag[0] == 0) argument_list[0].real_reference=80.0*QuantumRange/100.0; - image=SepiaToneImage(image,argument_list[0].real_reference, - exception); + image=SepiaToneImage(image,argument_list[0].real_reference,exception); break; } case 92: /* SigmoidalContrast */ @@ -10350,8 +10357,7 @@ Mogrify(ref,...) black_point*=(double) image->columns*image->rows/100.0; white_point*=(double) image->columns*image->rows/100.0; } - white_point=(double) image->columns*image->rows- - white_point; + white_point=(double) image->columns*image->rows-white_point; } if (attribute_flag[1] != 0) black_point=argument_list[1].real_reference; @@ -10596,12 +10602,12 @@ Mogrify(ref,...) char *caption; - DrawInfo - *draw_info; - double angle; + DrawInfo + *draw_info; + PixelInterpolateMethod method; @@ -10653,8 +10659,8 @@ Mogrify(ref,...) PixelInfo target; - draw_info=CloneDrawInfo(info ? info->image_info : - (ImageInfo *) NULL,(DrawInfo *) NULL); + draw_info=CloneDrawInfo(info ? info->image_info : (ImageInfo *) NULL, + (DrawInfo *) NULL); if (attribute_flag[0] != 0) flags=ParsePageGeometry(image,argument_list[0].string_reference, &geometry,exception); @@ -10690,12 +10696,12 @@ Mogrify(ref,...) AV *av; - double - *coordinates; - DistortMethod method; + double + *coordinates; + size_t number_coordinates; @@ -10824,12 +10830,12 @@ Mogrify(ref,...) double *coordinates; - SparseColorMethod - method; - size_t number_coordinates; + SparseColorMethod + method; + VirtualPixelMethod virtual_pixel; @@ -11423,8 +11429,8 @@ Mogrify(ref,...) if (next != (Image *) NULL) (void) CatchImageException(next); if ((region_info.width*region_info.height) != 0) - (void) SetImageRegionMask(image,WritePixelMask, - (const RectangleInfo *) NULL,exception); + (void) SetImageRegionMask(image,WritePixelMask,(const RectangleInfo *) + NULL,exception); if (image != (Image *) NULL) { number_images++; @@ -11490,12 +11496,12 @@ Montage(ref,...) *image, *next; - PixelInfo - transparent_color; - MontageInfo *montage_info; + PixelInfo + transparent_color; + register ssize_t i; @@ -12109,12 +12115,12 @@ PerceptualHash(ref) AV *av; - char - message[MagickPathExtent]; - ChannelPerceptualHash *channel_phash; + char + message[MagickPathExtent]; + ExceptionInfo *exception; -- 2.40.0