From aa2c16cb5e695053aa78e40f66bc36fbef4b1ed1 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 25 Mar 2012 22:21:35 +0000 Subject: [PATCH] --- Magick++/lib/Image.cpp | 17 ++-- MagickCore/channel.c | 6 +- MagickCore/composite.c | 2 +- MagickCore/constitute.c | 2 +- MagickCore/display.c | 15 ++- MagickCore/effect.c | 69 +++++--------- MagickCore/effect.h | 17 ++-- MagickCore/fx.c | 49 ++++------ MagickCore/fx.h | 13 ++- MagickCore/image.c | 7 +- MagickCore/image.h | 2 - MagickCore/montage.c | 2 +- MagickCore/morphology-private.h | 2 +- MagickCore/morphology.c | 19 ++-- MagickCore/pixel.c | 9 +- MagickCore/property.c | 7 -- MagickCore/resample-private.h | 2 +- MagickCore/resample.c | 16 ++-- MagickCore/resample.h | 2 +- MagickCore/resize-private.h | 4 +- MagickCore/resize.c | 41 ++++---- MagickCore/resize.h | 4 +- MagickCore/transform.c | 2 +- MagickCore/version.h | 2 +- MagickWand/magick-cli.c | 4 +- MagickWand/magick-image.c | 160 ++++++++------------------------ MagickWand/magick-image.h | 37 +++----- MagickWand/mogrify.c | 42 ++++----- MagickWand/operation.c | 61 +++++------- MagickWand/script-token.c | 2 +- PerlMagick/Magick.xs | 108 +++++++-------------- coders/hrz.c | 2 +- coders/msl.c | 74 ++------------- coders/pcd.c | 4 +- coders/png.c | 1 + coders/tiff.c | 3 +- coders/xpm.c | 2 +- coders/yuv.c | 6 +- config/ImageMagick.rdf | 4 +- config/configure.xml | 2 +- 40 files changed, 270 insertions(+), 553 deletions(-) diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index fd48530e3..bdce045d3 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -300,7 +300,7 @@ void Magick::Image::adaptiveBlur( const double radius_, const double sigma_ ) ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); MagickCore::Image* newImage = - AdaptiveBlurImage( image(), radius_, sigma_, image()->bias, &exceptionInfo); + AdaptiveBlurImage( image(), radius_, sigma_, &exceptionInfo); replaceImage( newImage ); throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); @@ -487,7 +487,7 @@ void Magick::Image::blur( const double radius_, const double sigma_ ) ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); MagickCore::Image* newImage = - BlurImage( image(), radius_, sigma_, image()->bias, &exceptionInfo); + BlurImage( image(), radius_, sigma_, &exceptionInfo); replaceImage( newImage ); throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); @@ -500,7 +500,7 @@ void Magick::Image::blurChannel( const ChannelType channel_, GetExceptionInfo( &exceptionInfo ); ChannelType channel_mask = SetPixelChannelMask( image(), channel_ ); MagickCore::Image* newImage = - BlurImage( image(), radius_, sigma_, image()->bias, &exceptionInfo); + BlurImage( image(), radius_, sigma_, &exceptionInfo); (void) SetPixelChannelMapMask( image(), channel_mask ); replaceImage( newImage ); throwException( exceptionInfo ); @@ -563,7 +563,7 @@ void Magick::Image::charcoal( const double radius_, const double sigma_ ) ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); MagickCore::Image* newImage = - CharcoalImage( image(), radius_, sigma_, image()->bias, &exceptionInfo ); + CharcoalImage( image(), radius_, sigma_, &exceptionInfo ); replaceImage( newImage ); throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); @@ -761,7 +761,6 @@ void Magick::Image::convolve ( const size_t order_, kernel_info->width=order_; kernel_info->height=order_; kernel_info->values=(MagickRealType *) kernel_; - kernel_info->bias=image()->bias; MagickCore::Image* newImage = ConvolveImage ( image(), kernel_info, &exceptionInfo ); kernel_info->values=(MagickRealType *) NULL; @@ -1428,7 +1427,7 @@ void Magick::Image::motionBlur ( const double radius_, ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); MagickCore::Image* newImage = - MotionBlurImage( image(), radius_, sigma_, angle_, 0.0, &exceptionInfo); + MotionBlurImage( image(), radius_, sigma_, angle_, &exceptionInfo); replaceImage( newImage ); throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); @@ -1824,7 +1823,6 @@ void Magick::Image::resize( const Geometry &geometry_ ) width, height, image()->filter, - 1.0, &exceptionInfo); replaceImage( newImage ); throwException( exceptionInfo ); @@ -1961,7 +1959,7 @@ void Magick::Image::shadow( const double percent_opacity_, const double sigma_, ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); MagickCore::Image* newImage = ShadowImage( image(), percent_opacity_, sigma_, - image()->bias, x_, y_, &exceptionInfo ); + x_, y_, &exceptionInfo ); replaceImage( newImage ); throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); @@ -1976,7 +1974,6 @@ void Magick::Image::sharpen ( const double radius_, const double sigma_ ) SharpenImage( image(), radius_, sigma_, - image()->bias, &exceptionInfo ); replaceImage( newImage ); throwException( exceptionInfo ); @@ -1993,7 +1990,6 @@ void Magick::Image::sharpenChannel ( const ChannelType channel_, SharpenImage( image(), radius_, sigma_, - image()->bias, &exceptionInfo ); (void) SetPixelChannelMapMask( image(), channel_mask ); replaceImage( newImage ); @@ -2416,7 +2412,6 @@ void Magick::Image::zoom( const Geometry &geometry_ ) width, height, image()->filter, - image()->blur, &exceptionInfo); replaceImage( newImage ); throwException( exceptionInfo ); diff --git a/MagickCore/channel.c b/MagickCore/channel.c index ff27d1420..8623ef67d 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -345,7 +345,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, return(destination_image); } destination_channel=(PixelChannel) i; - channel_mask|=ParseChannelOption(token); + channel_mask=(ChannelType) (channel_mask | ParseChannelOption(token)); if (LocaleCompare(token,"gray") == 0) (void) SetImageColorspace(destination_image,GRAYColorspace,exception); if ((LocaleCompare(token,"black") == 0) || @@ -395,8 +395,8 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, { case ExtractChannelOp: { - channel_mask|=(1 << destination_channel); - destination_channel++; + channel_mask=(ChannelType) (channel_mask | (1 << destination_channel)); + destination_channel=(PixelChannel) (destination_channel+1); break; } default: diff --git a/MagickCore/composite.c b/MagickCore/composite.c index a0dda1b96..59a36e656 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -807,7 +807,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, Blur Image by resampling. */ resample_filter=AcquireResampleFilter(image,exception); - SetResampleFilter(resample_filter,CubicFilter,2.0); + SetResampleFilter(resample_filter,CubicFilter); destination_view=AcquireCacheView(destination_image); composite_view=AcquireCacheView(composite_image); for (y=0; y < (ssize_t) composite_image->rows; y++) diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index de91c5827..204879841 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -748,7 +748,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, flags=ParseRegionGeometry(next,read_info->extract,&geometry, exception); size_image=ResizeImage(next,geometry.width,geometry.height, - next->filter,next->blur,exception); + next->filter,exception); if (size_image != (Image *) NULL) ReplaceImageInList(&next,size_image); } diff --git a/MagickCore/display.c b/MagickCore/display.c index 4a75b70b0..5e8b021c3 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -4297,8 +4297,7 @@ static MagickBooleanType XCompositeImage(Display *display, Scale composite image. */ resize_image=ResizeImage(composite_image,composite_info.width, - composite_info.height,composite_image->filter,composite_image->blur, - exception); + composite_info.height,composite_image->filter,exception); composite_image=DestroyImage(composite_image); if (resize_image == (Image *) NULL) { @@ -8236,7 +8235,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); flags=ParseGeometry(radius,&geometry_info); sharp_image=SharpenImage(*image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,exception); + exception); if (sharp_image != (Image *) NULL) { *image=DestroyImage(*image); @@ -8272,7 +8271,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, XCheckRefreshWindows(display,windows); flags=ParseGeometry(radius,&geometry_info); blur_image=BlurImage(*image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,exception); + exception); if (blur_image != (Image *) NULL) { *image=DestroyImage(*image); @@ -8651,9 +8650,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, geometry_info.xi=0.1*(*image)->columns; if ((flags & PsiValue) == 0) geometry_info.psi=0.1*(*image)->rows; - vignette_image=VignetteImage(*image,geometry_info.rho,geometry_info.sigma, - 0.0,(ssize_t) ceil(geometry_info.xi-0.5),(ssize_t) - ceil(geometry_info.psi-0.5),exception); + vignette_image=VignetteImage(*image,geometry_info.rho,0.0,(ssize_t) + ceil(geometry_info.xi-0.5),(ssize_t) ceil(geometry_info.psi-0.5), + exception); if (vignette_image != (Image *) NULL) { *image=DestroyImage(*image); @@ -8767,7 +8766,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; charcoal_image=CharcoalImage(*image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,exception); + exception); if (charcoal_image != (Image *) NULL) { *image=DestroyImage(*image); diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 9cdc3d0d2..ba9c80183 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -108,7 +108,7 @@ % The format of the AdaptiveBlurImage method is: % % Image *AdaptiveBlurImage(const Image *image,const double radius, -% const double sigma,const double bias,ExceptionInfo *exception) +% const double sigma,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -119,8 +119,6 @@ % % o sigma: the standard deviation of the Laplacian, in pixels. % -% o bias: the bias. -% % o exception: return any errors or warnings in this structure. % */ @@ -170,7 +168,7 @@ MagickExport MagickBooleanType AdaptiveLevelImage(Image *image, } MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, - const double sigma,const double bias,ExceptionInfo *exception) + const double sigma,ExceptionInfo *exception) { #define AdaptiveBlurImageTag "Convolve/Image" #define MagickSigma (fabs(sigma) <= MagickEpsilon ? 1.0 : sigma) @@ -386,7 +384,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, } k=kernel[j]; pixels=p; - pixel=bias; + pixel=0.0; gamma=0.0; if ((blur_traits & BlendPixelTrait) == 0) { @@ -476,7 +474,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, % The format of the AdaptiveSharpenImage method is: % % Image *AdaptiveSharpenImage(const Image *image,const double radius, -% const double sigma,const double bias,ExceptionInfo *exception) +% const double sigma,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -487,13 +485,11 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, % % o sigma: the standard deviation of the Laplacian, in pixels. % -% o bias: the bias. -% % o exception: return any errors or warnings in this structure. % */ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, - const double sigma,const double bias,ExceptionInfo *exception) + const double sigma,ExceptionInfo *exception) { #define AdaptiveSharpenImageTag "Convolve/Image" #define MagickSigma (fabs(sigma) <= MagickEpsilon ? 1.0 : sigma) @@ -709,7 +705,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, } k=kernel[j]; pixels=p; - pixel=bias; + pixel=0.0; gamma=0.0; if ((sharp_traits & BlendPixelTrait) == 0) { @@ -802,7 +798,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, % The format of the BlurImage method is: % % Image *BlurImage(const Image *image,const double radius, -% const double sigma,const double bias,ExceptionInfo *exception) +% const double sigma,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -813,8 +809,6 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% % o exception: return any errors or warnings in this structure. % */ @@ -855,7 +849,7 @@ static double *GetBlurKernel(const size_t width,const double sigma) } MagickExport Image *BlurImage(const Image *image,const double radius, - const double sigma,const double bias,ExceptionInfo *exception) + const double sigma,ExceptionInfo *exception) { #define BlurImageTag "Blur/Image" @@ -1597,7 +1591,6 @@ MagickExport Image *EdgeImage(const Image *image,const double radius, } } kernel_info->values[i/2]=(double) (width*width-1.0); - kernel_info->bias=image->bias; /* FUTURE: User bias on a edge image? */ edge_image=ConvolveImage(image,kernel_info,exception); kernel_info=DestroyKernelInfo(kernel_info); return(edge_image); @@ -1692,7 +1685,6 @@ MagickExport Image *EmbossImage(const Image *image,const double radius, } k--; } - kernel_info->bias=image->bias; /* FUTURE: user bias on an edge image */ emboss_image=ConvolveImage(image,kernel_info,exception); kernel_info=DestroyKernelInfo(kernel_info); if (emboss_image != (Image *) NULL) @@ -1812,8 +1804,7 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius, % The format of the MotionBlurImage method is: % % Image *MotionBlurImage(const Image *image,const double radius, -% const double sigma,const double angle,const double bias, -% ExceptionInfo *exception) +% const double sigma,const double angle,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -1826,8 +1817,6 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius, % % o angle: Apply the effect along this angle. % -% o bias: the bias. -% % o exception: return any errors or warnings in this structure. % */ @@ -1861,8 +1850,7 @@ static double *GetMotionBlurKernel(const size_t width,const double sigma) } MagickExport Image *MotionBlurImage(const Image *image,const double radius, - const double sigma,const double angle,const double bias, - ExceptionInfo *exception) + const double sigma,const double angle,ExceptionInfo *exception) { CacheView *blur_view, @@ -2005,7 +1993,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, continue; } k=kernel; - pixel=bias; + pixel=0.0; if ((blur_traits & BlendPixelTrait) == 0) { for (j=0; j < (ssize_t) width; j++) @@ -2373,17 +2361,14 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, } case SharpenPreview: { - /* FUTURE: user bias on sharpen! This is non-sensical! */ - preview_image=SharpenImage(thumbnail,radius,sigma,image->bias, - exception); + preview_image=SharpenImage(thumbnail,radius,sigma,exception); (void) FormatLocaleString(label,MaxTextExtent,"sharpen %gx%g", radius,sigma); break; } case BlurPreview: { - /* FUTURE: user bias on blur! This is non-sensical! */ - preview_image=BlurImage(thumbnail,radius,sigma,image->bias,exception); + preview_image=BlurImage(thumbnail,radius,sigma,exception); (void) FormatLocaleString(label,MaxTextExtent,"blur %gx%g",radius, sigma); break; @@ -2495,9 +2480,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, } case CharcoalDrawingPreview: { - /* FUTURE: user bias on charcoal! This is non-sensical! */ preview_image=CharcoalImage(thumbnail,(double) radius,(double) sigma, - image->bias,exception); + exception); (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g", radius,sigma); break; @@ -2621,7 +2605,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, % The format of the RadialBlurImage method is: % % Image *RadialBlurImage(const Image *image,const double angle, -% const double blur,ExceptionInfo *exception) +% ExceptionInfo *exception) % % A description of each parameter follows: % @@ -2635,7 +2619,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, % */ MagickExport Image *RadialBlurImage(const Image *image,const double angle, - const double bias,ExceptionInfo *exception) + ExceptionInfo *exception) { CacheView *blur_view, @@ -2800,7 +2784,7 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, continue; } gamma=0.0; - pixel=bias; + pixel=0.0; if ((blur_traits & BlendPixelTrait) == 0) { for (j=0; j < (ssize_t) n; j+=(ssize_t) step) @@ -2884,8 +2868,7 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, % The format of the SelectiveBlurImage method is: % % Image *SelectiveBlurImage(const Image *image,const double radius, -% const double sigma,const double threshold,const double bias, -% ExceptionInfo *exception) +% const double sigma,const double threshold,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -2899,14 +2882,11 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, % o threshold: only pixels within this contrast threshold are included % in the blur operation. % -% o bias: the bias. -% % o exception: return any errors or warnings in this structure. % */ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, - const double sigma,const double threshold,const double bias, - ExceptionInfo *exception) + const double sigma,const double threshold,ExceptionInfo *exception) { #define SelectiveBlurImageTag "SelectiveBlur/Image" @@ -3085,7 +3065,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, continue; } k=kernel; - pixel=bias; + pixel=0.0; pixels=p; intensity=(MagickRealType) GetPixelIntensity(image,p+center); gamma=0.0; @@ -3412,7 +3392,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, % The format of the SharpenImage method is: % % Image *SharpenImage(const Image *image,const double radius, -% const double sigma,const double bias,ExceptionInfo *exception) +% const double sigma,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -3423,13 +3403,11 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, % % o sigma: the standard deviation of the Laplacian, in pixels. % -% o bias: bias. -% % o exception: return any errors or warnings in this structure. % */ MagickExport Image *SharpenImage(const Image *image,const double radius, - const double sigma,const double bias,ExceptionInfo *exception) + const double sigma,ExceptionInfo *exception) { double normalize; @@ -3464,7 +3442,6 @@ MagickExport Image *SharpenImage(const Image *image,const double radius, (void) ResetMagickMemory(kernel_info,0,sizeof(*kernel_info)); kernel_info->width=width; kernel_info->height=width; - kernel_info->bias=bias; /* FUTURE: user bias - non-sensical! */ kernel_info->signature=MagickSignature; kernel_info->values=(MagickRealType *) AcquireAlignedMemory( kernel_info->width,kernel_info->width*sizeof(*kernel_info->values)); @@ -3704,7 +3681,7 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); - unsharp_image=BlurImage(image,radius,sigma,image->bias,exception); + unsharp_image=BlurImage(image,radius,sigma,exception); if (unsharp_image == (Image *) NULL) return((Image *) NULL); quantum_threshold=(MagickRealType) QuantumRange*threshold; diff --git a/MagickCore/effect.h b/MagickCore/effect.h index 4690212d4..1a9b1e9f8 100644 --- a/MagickCore/effect.h +++ b/MagickCore/effect.h @@ -59,27 +59,24 @@ typedef enum } PreviewType; extern MagickExport Image - *AdaptiveBlurImage(const Image *,const double,const double,const double, - ExceptionInfo *), - *AdaptiveSharpenImage(const Image *,const double,const double,const double, + *AdaptiveBlurImage(const Image *,const double,const double,ExceptionInfo *), + *AdaptiveSharpenImage(const Image *,const double,const double, ExceptionInfo *), - *BlurImage(const Image *,const double,const double,const double, - ExceptionInfo *), + *BlurImage(const Image *,const double,const double,ExceptionInfo *), *ConvolveImage(const Image *,const KernelInfo *,ExceptionInfo *), *DespeckleImage(const Image *,ExceptionInfo *), *EdgeImage(const Image *,const double,const double,ExceptionInfo *), *EmbossImage(const Image *,const double,const double,ExceptionInfo *), *GaussianBlurImage(const Image *,const double,const double,ExceptionInfo *), *MotionBlurImage(const Image *,const double,const double,const double, - const double,ExceptionInfo *), + ExceptionInfo *), *PreviewImage(const Image *,const PreviewType,ExceptionInfo *), - *RadialBlurImage(const Image *,const double,const double,ExceptionInfo *), + *RadialBlurImage(const Image *,const double,ExceptionInfo *), *SelectiveBlurImage(const Image *,const double,const double,const double, - const double,ExceptionInfo *), - *ShadeImage(const Image *,const MagickBooleanType,const double,const double, ExceptionInfo *), - *SharpenImage(const Image *,const double,const double,const double, + *ShadeImage(const Image *,const MagickBooleanType,const double,const double, ExceptionInfo *), + *SharpenImage(const Image *,const double,const double,ExceptionInfo *), *SpreadImage(const Image *,const double,const PixelInterpolateMethod, ExceptionInfo *), *UnsharpMaskImage(const Image *,const double,const double,const double, diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 24691ee65..e6b47dcf5 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -560,7 +560,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, % The format of the CharcoalImage method is: % % Image *CharcoalImage(const Image *image,const double radius, -% const double sigma,const double bias,ExceptionInfo *exception) +% const double sigma,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -570,13 +570,11 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% % o exception: return any errors or warnings in this structure. % */ MagickExport Image *CharcoalImage(const Image *image,const double radius, - const double sigma,const double bias,ExceptionInfo *exception) + const double sigma,ExceptionInfo *exception) { Image *charcoal_image, @@ -597,7 +595,7 @@ MagickExport Image *CharcoalImage(const Image *image,const double radius, clone_image=DestroyImage(clone_image); if (edge_image == (Image *) NULL) return((Image *) NULL); - charcoal_image=BlurImage(edge_image,radius,sigma,bias,exception); + charcoal_image=BlurImage(edge_image,radius,sigma,exception); edge_image=DestroyImage(edge_image); if (charcoal_image == (Image *) NULL) return((Image *) NULL); @@ -3482,9 +3480,8 @@ MagickExport Image *MorphImages(const Image *image, beta=(MagickRealType) (i+1.0)/(MagickRealType) (number_frames+1.0); alpha=1.0-beta; morph_image=ResizeImage(next,(size_t) (alpha*next->columns+beta* - GetNextImageInList(next)->columns+0.5),(size_t) (alpha* - next->rows+beta*GetNextImageInList(next)->rows+0.5), - next->filter,next->blur,exception); + GetNextImageInList(next)->columns+0.5),(size_t) (alpha*next->rows+beta* + GetNextImageInList(next)->rows+0.5),next->filter,exception); if (morph_image == (Image *) NULL) { morph_images=DestroyImageList(morph_images); @@ -3499,8 +3496,7 @@ MagickExport Image *MorphImages(const Image *image, AppendImageToList(&morph_images,morph_image); morph_images=GetLastImageInList(morph_images); morph_image=ResizeImage(GetNextImageInList(next),morph_images->columns, - morph_images->rows,GetNextImageInList(next)->filter, - GetNextImageInList(next)->blur,exception); + morph_images->rows,GetNextImageInList(next)->filter,exception); if (morph_image == (Image *) NULL) { morph_images=DestroyImageList(morph_images); @@ -4050,7 +4046,7 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info, return((Image *) NULL); picture_image=rotate_image; picture_image->background_color=image->background_color; - polaroid_image=ShadowImage(picture_image,80.0,2.0,0.0,quantum/3,quantum/3, + polaroid_image=ShadowImage(picture_image,80.0,0.0,quantum/3,quantum/3, exception); if (polaroid_image == (Image *) NULL) { @@ -4246,8 +4242,8 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, % The format of the ShadowImage method is: % % Image *ShadowImage(const Image *image,const double alpha, -% const double sigma,const double bias,const ssize_t x_offset, -% const ssize_t y_offset,ExceptionInfo *exception) +% const double sigma,const ssize_t x_offset,const ssize_t y_offset, +% ExceptionInfo *exception) % % A description of each parameter follows: % @@ -4257,8 +4253,6 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% % o x_offset: the shadow x-offset. % % o y_offset: the shadow y-offset. @@ -4267,8 +4261,8 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, % */ MagickExport Image *ShadowImage(const Image *image,const double alpha, - const double sigma,const double bias,const ssize_t x_offset, - const ssize_t y_offset,ExceptionInfo *exception) + const double sigma,const ssize_t x_offset,const ssize_t y_offset, + ExceptionInfo *exception) { #define ShadowImageTag "Shadow/Image" @@ -4360,7 +4354,7 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha, return((Image *) NULL); } channel_mask=SetPixelChannelMask(border_image,AlphaChannel); - shadow_image=BlurImage(border_image,0.0,sigma,bias,exception); + shadow_image=BlurImage(border_image,0.0,sigma,exception); border_image=DestroyImage(border_image); if (shadow_image == (Image *) NULL) return((Image *) NULL); @@ -4396,8 +4390,7 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha, % The format of the SketchImage method is: % % Image *SketchImage(const Image *image,const double radius, -% const double sigma,const double angle,const double bias, -% ExceptionInfo *exception) +% const double sigma,const double angle,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -4410,14 +4403,11 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha, % % o angle: apply the effect along this angle. % -% o bias: the bias. -% % o exception: return any errors or warnings in this structure. % */ MagickExport Image *SketchImage(const Image *image,const double radius, - const double sigma,const double angle,const double bias, - ExceptionInfo *exception) + const double sigma,const double angle,ExceptionInfo *exception) { CacheView *random_view; @@ -4511,7 +4501,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius, random_image=DestroyImage(random_image); return(random_image); } - blur_image=MotionBlurImage(random_image,radius,sigma,angle,bias,exception); + blur_image=MotionBlurImage(random_image,radius,sigma,angle,exception); random_image=DestroyImage(random_image); if (blur_image == (Image *) NULL) return((Image *) NULL); @@ -5457,7 +5447,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend, % The format of the VignetteImage method is: % % Image *VignetteImage(const Image *image,const double radius, -% const double sigma,const double bias,const ssize_t x,const ssize_t y, +% const double sigma,const ssize_t x,const ssize_t y, % ExceptionInfo *exception) % % A description of each parameter follows: @@ -5468,16 +5458,13 @@ MagickExport Image *TintImage(const Image *image,const char *blend, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% % o x, y: Define the x and y ellipse offset. % % o exception: return any errors or warnings in this structure. % */ MagickExport Image *VignetteImage(const Image *image,const double radius, - const double sigma,const double bias,const ssize_t x,const ssize_t y, - ExceptionInfo *exception) + const double sigma,const ssize_t x,const ssize_t y,ExceptionInfo *exception) { char ellipse[MaxTextExtent]; @@ -5527,7 +5514,7 @@ MagickExport Image *VignetteImage(const Image *image,const double radius, draw_info->primitive=AcquireString(ellipse); (void) DrawImage(oval_image,draw_info,exception); draw_info=DestroyDrawInfo(draw_info); - blur_image=BlurImage(oval_image,radius,sigma,bias,exception); + blur_image=BlurImage(oval_image,radius,sigma,exception); oval_image=DestroyImage(oval_image); if (blur_image == (Image *) NULL) { diff --git a/MagickCore/fx.h b/MagickCore/fx.h index 95767931a..bc9c75d26 100644 --- a/MagickCore/fx.h +++ b/MagickCore/fx.h @@ -39,8 +39,7 @@ typedef enum extern MagickExport Image *AddNoiseImage(const Image *,const NoiseType,const double,ExceptionInfo *), *BlueShiftImage(const Image *,const double,ExceptionInfo *), - *CharcoalImage(const Image *,const double,const double,const double, - ExceptionInfo *), + *CharcoalImage(const Image *,const double,const double,ExceptionInfo *), *ColorizeImage(const Image *,const char *,const PixelInfo *,ExceptionInfo *), *ColorMatrixImage(const Image *,const KernelInfo *kernel,ExceptionInfo *), *FxImage(const Image *,const char *,ExceptionInfo *), @@ -50,10 +49,10 @@ extern MagickExport Image *PolaroidImage(const Image *,const DrawInfo *,const char *,const double, const PixelInterpolateMethod,ExceptionInfo *), *SepiaToneImage(const Image *,const double,ExceptionInfo *), - *ShadowImage(const Image *,const double,const double,const double, - const ssize_t,const ssize_t,ExceptionInfo *), + *ShadowImage(const Image *,const double,const double,const ssize_t, + const ssize_t,ExceptionInfo *), *SketchImage(const Image *,const double,const double,const double, - const double,ExceptionInfo *), + ExceptionInfo *), *SteganoImage(const Image *,const Image *,ExceptionInfo *), *StereoImage(const Image *,const Image *,ExceptionInfo *), *StereoAnaglyphImage(const Image *,const Image *,const ssize_t,const ssize_t, @@ -61,8 +60,8 @@ extern MagickExport Image *SwirlImage(const Image *,double,const PixelInterpolateMethod, ExceptionInfo *), *TintImage(const Image *,const char *,const PixelInfo *,ExceptionInfo *), - *VignetteImage(const Image *,const double,const double,const double, - const ssize_t,const ssize_t,ExceptionInfo *), + *VignetteImage(const Image *,const double,const double,const ssize_t, + const ssize_t,ExceptionInfo *), *WaveImage(const Image *,const double,const double, const PixelInterpolateMethod,ExceptionInfo *); diff --git a/MagickCore/image.c b/MagickCore/image.c index d29352476..e1e71c263 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -187,7 +187,6 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info, image->interlace=NoInterlace; image->ticks_per_second=UndefinedTicksPerSecond; image->compose=OverCompositeOp; - image->blur=1.0; (void) QueryColorCompliance(BackgroundColor,AllCompliance, &image->background_color,exception); (void) QueryColorCompliance(BorderColor,AllCompliance,&image->border_color, @@ -3854,9 +3853,6 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, if (option != (const char *) NULL) (void) QueryColorCompliance(option,AllCompliance,&image->background_color, exception); - option=GetImageOption(image_info,"bias"); - if (option != (const char *) NULL) - image->bias=StringToDoubleInterval(option,(double) QuantumRange+1.0); option=GetImageOption(image_info,"black-point-compensation"); if (option != (const char *) NULL) image->black_point_compensation=(MagickBooleanType) ParseCommandOption( @@ -3876,7 +3872,8 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info, exception); option=GetImageOption(image_info,"channel"); if (option != (const char *) NULL) - (void) SetPixelChannelMapMask(image,ParseChannelOption(option)); + (void) SetPixelChannelMapMask(image,(ChannelType) + ParseChannelOption(option)); /* FUTURE: do not sync compose to per-image compose setting here */ option=GetImageOption(image_info,"compose"); if (option != (const char *) NULL) diff --git a/MagickCore/image.h b/MagickCore/image.h index 6753323d3..79e05c819 100644 --- a/MagickCore/image.h +++ b/MagickCore/image.h @@ -211,8 +211,6 @@ struct _Image extract_info; double - bias, /* FUTURE: depreciated -- convolve bias */ - blur, /* FUTURE: depreciated -- resize file blur */ fuzz; /* current color fuzz attribute - make image_info */ FilterTypes diff --git a/MagickCore/montage.c b/MagickCore/montage.c index a3d07e33c..a2c2034e7 100644 --- a/MagickCore/montage.c +++ b/MagickCore/montage.c @@ -820,7 +820,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, */ (void) QueryColorCompliance("#0000",AllCompliance, &image->background_color,exception); - shadow_image=ShadowImage(image,80.0,2.0,0.0,5,5,exception); + shadow_image=ShadowImage(image,80.0,0.0,5,5,exception); if (shadow_image != (Image *) NULL) { (void) CompositeImage(shadow_image,OverCompositeOp,image,0,0, diff --git a/MagickCore/morphology-private.h b/MagickCore/morphology-private.h index 072217b43..44015ff3a 100644 --- a/MagickCore/morphology-private.h +++ b/MagickCore/morphology-private.h @@ -30,7 +30,7 @@ extern "C" { extern MagickPrivate Image *MorphologyApply(const Image *,const MorphologyMethod,const ssize_t, - const KernelInfo *,const CompositeOperator,const double,ExceptionInfo *); + const KernelInfo *,const CompositeOperator,ExceptionInfo *); extern MagickPrivate void ShowKernelInfo(const KernelInfo *), diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index cedb6cb3a..c1795f134 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2463,8 +2463,7 @@ static void CalcKernelMetaData(KernelInfo *kernel) % % Image *MorphologyApply(const Image *image,MorphologyMethod method, % const ssize_t iterations,const KernelInfo *kernel, -% const CompositeMethod compose,const double bias, -% ExceptionInfo *exception) +% const CompositeMethod compose,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -2486,8 +2485,6 @@ static void CalcKernelMetaData(KernelInfo *kernel) % If 'NoCompositeOp' force image to be re-iterated by each kernel. % Otherwise merge the results using the compose method given. % -% o bias: Convolution Output Bias. -% % o exception: return any errors or warnings in this structure. % */ @@ -2498,7 +2495,7 @@ static void CalcKernelMetaData(KernelInfo *kernel) ** for result convergence determination. */ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, - const MorphologyMethod method,const KernelInfo *kernel,const double bias, + const MorphologyMethod method,const KernelInfo *kernel, ExceptionInfo *exception) { #define MorphologyTag "Morphology/Image" @@ -2645,7 +2642,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, result.green = result.blue = result.alpha = - result.black = bias; + result.black = 0.0; /* Weighted Average of pixels using reflected kernel @@ -2847,7 +2844,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, result.green = result.blue = result.alpha = - result.black = bias; + result.black = 0.0; break; case DilateIntensityMorphology: case ErodeIntensityMorphology: @@ -3741,7 +3738,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, */ MagickPrivate Image *MorphologyApply(const Image *image, const MorphologyMethod method, const ssize_t iterations, - const KernelInfo *kernel, const CompositeOperator compose,const double bias, + const KernelInfo *kernel, const CompositeOperator compose, ExceptionInfo *exception) { CompositeOperator @@ -4045,7 +4042,7 @@ MagickPrivate Image *MorphologyApply(const Image *image, /* APPLY THE MORPHOLOGICAL PRIMITIVE (curr -> work) */ count++; changed = MorphologyPrimitive(curr_image, work_image, primitive, - this_kernel, bias, exception); + this_kernel, exception); if ( verbose == MagickTrue ) { if ( kernel_loop > 1 ) @@ -4293,8 +4290,8 @@ MagickExport Image *MorphologyImage(const Image *image, MagickFalse,artifact); } /* Apply the Morphology */ - morphology_image = MorphologyApply(image, method, iterations, - curr_kernel, compose, image->bias, exception); + morphology_image=MorphologyApply(image,method,iterations,curr_kernel,compose, + exception); /* Cleanup and Exit */ if ( curr_kernel != kernel ) diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 93a528e29..63ab2f215 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4185,8 +4185,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, status=MagickFalse; break; } - filter_image=ResizeImage(excerpt_image,1,1,image->filter,image->blur, - exception); + filter_image=ResizeImage(excerpt_image,1,1,image->filter,exception); excerpt_image=DestroyImage(excerpt_image); if (filter_image == (Image *) NULL) break; @@ -4635,8 +4634,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, status=MagickFalse; continue; } - filter_source=ResizeImage(excerpt_source,1,1,source->filter, - source->blur,exception); + filter_source=ResizeImage(excerpt_source,1,1,source->filter,exception); excerpt_source=DestroyImage(excerpt_source); if (filter_source == (Image *) NULL) continue; @@ -5164,8 +5162,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, status=MagickFalse; break; } - filter_image=ResizeImage(excerpt_image,1,1,image->filter,image->blur, - exception); + filter_image=ResizeImage(excerpt_image,1,1,image->filter,exception); excerpt_image=DestroyImage(excerpt_image); if (filter_image == (Image *) NULL) break; diff --git a/MagickCore/property.c b/MagickCore/property.c index ecd6c5a20..df3fe18e0 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -143,9 +143,7 @@ MagickExport MagickBooleanType CloneImageProperties(Image *image, image->page=clone_image->page; image->tile_offset=clone_image->tile_offset; image->extract_info=clone_image->extract_info; - image->bias=clone_image->bias; image->filter=clone_image->filter; - image->blur=clone_image->blur; image->fuzz=clone_image->fuzz; image->interlace=clone_image->interlace; image->interpolate=clone_image->interpolate; @@ -3217,11 +3215,6 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, &image->background_color,exception); break; } - if (LocaleCompare(property,"bias") == 0) - { - image->bias=StringToDoubleInterval(value,(double) QuantumRange+1.0); - break; - } status=AddValueToSplayTree((SplayTreeInfo *) image->properties, ConstantString(property),ConstantString(value)); break; diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h index 706b81868..43f16714a 100644 --- a/MagickCore/resample-private.h +++ b/MagickCore/resample-private.h @@ -65,7 +65,7 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet( if (method != UndefinedVirtualPixelMethod) (void) SetResampleFilterVirtualPixelMethod(filter[i],method); if (interpolate != MagickFalse) - SetResampleFilter(filter[i],PointFilter,1.0); + SetResampleFilter(filter[i],PointFilter); } return(filter); } diff --git a/MagickCore/resample.c b/MagickCore/resample.c index 4fb94ef2c..fa8efc1bd 100644 --- a/MagickCore/resample.c +++ b/MagickCore/resample.c @@ -232,12 +232,10 @@ MagickExport ResampleFilter *AcquireResampleFilter(const Image *image, resample_filter->average_defined = MagickFalse; /* initialise the resampling filter settings */ - SetResampleFilter(resample_filter, image->filter, image->blur); - (void) SetResampleFilterInterpolateMethod(resample_filter, - image->interpolate); + SetResampleFilter(resample_filter, image->filter); + (void) SetResampleFilterInterpolateMethod(resample_filter,image->interpolate); (void) SetResampleFilterVirtualPixelMethod(resample_filter, GetImageVirtualPixelMethod(image)); - return(resample_filter); } @@ -469,7 +467,7 @@ MagickExport MagickBooleanType ResamplePixelColor( resample_filter->average_defined=MagickTrue; /* Try to get an averaged pixel color of whole image */ - average_image=ResizeImage(resample_filter->image,1,1,BoxFilter,1.0, + average_image=ResizeImage(resample_filter->image,1,1,BoxFilter, resample_filter->exception); if (average_image == (Image *) NULL) { @@ -1216,7 +1214,7 @@ MagickExport void ScaleResampleFilter(ResampleFilter *resample_filter, % The format of the SetResampleFilter method is: % % void SetResampleFilter(ResampleFilter *resample_filter, -% const FilterTypes filter,const double blur) +% const FilterTypes filter) % % A description of each parameter follows: % @@ -1224,11 +1222,9 @@ MagickExport void ScaleResampleFilter(ResampleFilter *resample_filter, % % o filter: the resize filter for elliptical weighting LUT % -% o blur: filter blur factor (radial scaling) for elliptical weighting LUT -% */ MagickExport void SetResampleFilter(ResampleFilter *resample_filter, - const FilterTypes filter,const double blur) + const FilterTypes filter) { ResizeFilter *resize_filter; @@ -1250,7 +1246,7 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter, resample_filter->filter = RobidouxFilter; resize_filter = AcquireResizeFilter(resample_filter->image, - resample_filter->filter,blur,MagickTrue,resample_filter->exception); + resample_filter->filter,MagickTrue,resample_filter->exception); if (resize_filter == (ResizeFilter *) NULL) { (void) ThrowMagickException(resample_filter->exception,GetMagickModule(), diff --git a/MagickCore/resample.h b/MagickCore/resample.h index b33c333cd..253a0f801 100644 --- a/MagickCore/resample.h +++ b/MagickCore/resample.h @@ -86,7 +86,7 @@ extern MagickExport ResampleFilter extern MagickExport void ScaleResampleFilter(ResampleFilter *,const double,const double,const double, const double), - SetResampleFilter(ResampleFilter *,const FilterTypes,const double); + SetResampleFilter(ResampleFilter *,const FilterTypes); #if defined(__cplusplus) || defined(c_plusplus) } diff --git a/MagickCore/resize-private.h b/MagickCore/resize-private.h index 552ddc6f9..3712f17f3 100644 --- a/MagickCore/resize-private.h +++ b/MagickCore/resize-private.h @@ -30,8 +30,8 @@ extern MagickPrivate MagickRealType GetResizeFilterWeight(const ResizeFilter *,const MagickRealType); extern MagickPrivate ResizeFilter - *AcquireResizeFilter(const Image *,const FilterTypes,const MagickRealType, - const MagickBooleanType,ExceptionInfo *), + *AcquireResizeFilter(const Image *,const FilterTypes,const MagickBooleanType, + ExceptionInfo *), *DestroyResizeFilter(ResizeFilter *); #if defined(__cplusplus) || defined(c_plusplus) diff --git a/MagickCore/resize.c b/MagickCore/resize.c index ba3d87ab2..be954fd84 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -630,7 +630,7 @@ static MagickRealType Welsh(const MagickRealType x, % The format of the AcquireResizeFilter method is: % % ResizeFilter *AcquireResizeFilter(const Image *image, -% const FilterTypes filter_type, const MagickBooleanType radial, +% const FilterTypes filter_type,const MagickBooleanType radial, % ExceptionInfo *exception) % % A description of each parameter follows: @@ -651,8 +651,8 @@ static MagickRealType Welsh(const MagickRealType x, % */ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image, - const FilterTypes filter,const MagickRealType blur, - const MagickBooleanType cylindrical,ExceptionInfo *exception) + const FilterTypes filter,const MagickBooleanType cylindrical, + ExceptionInfo *exception) { const char *artifact; @@ -818,7 +818,6 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image, */ filter_type=mapping[filter].filter; window_type=mapping[filter].window; - resize_filter->blur = blur; /* function argument blur factor */ /* Promote 1D Windowed Sinc Filters to a 2D Windowed Jinc filters */ if ((cylindrical != MagickFalse) && (filter_type == SincFastFilter) && (filter != SincFastFilter)) @@ -1739,7 +1738,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, if ((columns == image->columns) && (rows == image->rows)) return(CloneImage(image,0,0,MagickTrue,exception)); if ((columns <= 2) || (rows <= 2)) - return(ResizeImage(image,columns,rows,image->filter,image->blur,exception)); + return(ResizeImage(image,columns,rows,image->filter,exception)); if ((columns >= (2*image->columns)) || (rows >= (2*image->rows))) { Image @@ -1754,8 +1753,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, */ for (width=image->columns; columns >= (2*width-1); width*=2); for (height=image->rows; rows >= (2*height-1); height*=2); - resize_image=ResizeImage(image,width,height,image->filter,image->blur, - exception); + resize_image=ResizeImage(image,width,height,image->filter,exception); if (resize_image == (Image *) NULL) return((Image *) NULL); rescale_image=LiquidRescaleImage(resize_image,columns,rows,delta_x, @@ -1914,7 +1912,7 @@ MagickExport Image *MagnifyImage(const Image *image,ExceptionInfo *exception) assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); magnify_image=ResizeImage(image,2*image->columns,2*image->rows,CubicFilter, - 1.0,exception); + exception); return(magnify_image); } @@ -1954,7 +1952,7 @@ MagickExport Image *MinifyImage(const Image *image,ExceptionInfo *exception) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); - minify_image=ResizeImage(image,image->columns/2,image->rows/2,CubicFilter,1.0, + minify_image=ResizeImage(image,image->columns/2,image->rows/2,CubicFilter, exception); return(minify_image); } @@ -1977,7 +1975,7 @@ MagickExport Image *MinifyImage(const Image *image,ExceptionInfo *exception) % The format of the ResampleImage method is: % % Image *ResampleImage(Image *image,const double x_resolution, -% const double y_resolution,const FilterTypes filter,const double blur, +% const double y_resolution,const FilterTypes filter, % ExceptionInfo *exception) % % A description of each parameter follows: @@ -1990,12 +1988,11 @@ MagickExport Image *MinifyImage(const Image *image,ExceptionInfo *exception) % % o filter: Image filter to use. % -% o blur: the blur factor where > 1 is blurry, < 1 is sharp. +% o exception: return any errors or warnings in this structure. % */ MagickExport Image *ResampleImage(const Image *image,const double x_resolution, - const double y_resolution,const FilterTypes filter,const double blur, - ExceptionInfo *exception) + const double y_resolution,const FilterTypes filter,ExceptionInfo *exception) { #define ResampleImageTag "Resample/Image" @@ -2019,7 +2016,7 @@ MagickExport Image *ResampleImage(const Image *image,const double x_resolution, 72.0 : image->resolution.x)+0.5); height=(size_t) (y_resolution*image->rows/(image->resolution.y == 0.0 ? 72.0 : image->resolution.y)+0.5); - resample_image=ResizeImage(image,width,height,filter,blur,exception); + resample_image=ResizeImage(image,width,height,filter,exception); if (resample_image != (Image *) NULL) { resample_image->resolution.x=x_resolution; @@ -2559,8 +2556,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, } MagickExport Image *ResizeImage(const Image *image,const size_t columns, - const size_t rows,const FilterTypes filter,const double blur, - ExceptionInfo *exception) + const size_t rows,const FilterTypes filter,ExceptionInfo *exception) { #define WorkLoadFactor 0.265 @@ -2599,7 +2595,7 @@ MagickExport Image *ResizeImage(const Image *image,const size_t columns, if ((columns == 0) || (rows == 0)) ThrowImageException(ImageError,"NegativeOrZeroImageSize"); if ((columns == image->columns) && (rows == image->rows) && - (filter == UndefinedFilter) && (blur == 1.0)) + (filter == UndefinedFilter)) return(CloneImage(image,0,0,MagickTrue,exception)); resize_image=CloneImage(image,columns,rows,MagickTrue,exception); if (resize_image == (Image *) NULL) @@ -2625,8 +2621,7 @@ MagickExport Image *ResizeImage(const Image *image,const size_t columns, if ((image->storage_class == PseudoClass) || (image->matte != MagickFalse) || ((x_factor*y_factor) > 1.0)) filter_type=MitchellFilter; - resize_filter=AcquireResizeFilter(image,filter_type,blur,MagickFalse, - exception); + resize_filter=AcquireResizeFilter(image,filter_type,MagickFalse,exception); /* Resize image. */ @@ -3358,12 +3353,10 @@ MagickExport Image *ThumbnailImage(const Image *image,const size_t columns, x_factor=(MagickRealType) columns/(MagickRealType) image->columns; y_factor=(MagickRealType) rows/(MagickRealType) image->rows; if ((x_factor*y_factor) > 0.1) - thumbnail_image=ResizeImage(image,columns,rows,image->filter,image->blur, - exception); + thumbnail_image=ResizeImage(image,columns,rows,image->filter,exception); else if (((SampleFactor*columns) < 128) || ((SampleFactor*rows) < 128)) - thumbnail_image=ResizeImage(image,columns,rows,image->filter, - image->blur,exception); + thumbnail_image=ResizeImage(image,columns,rows,image->filter,exception); else { Image @@ -3374,7 +3367,7 @@ MagickExport Image *ThumbnailImage(const Image *image,const size_t columns, if (sample_image == (Image *) NULL) return((Image *) NULL); thumbnail_image=ResizeImage(sample_image,columns,rows,image->filter, - image->blur,exception); + exception); sample_image=DestroyImage(sample_image); } if (thumbnail_image == (Image *) NULL) diff --git a/MagickCore/resize.h b/MagickCore/resize.h index f7e509064..b47f2a811 100644 --- a/MagickCore/resize.h +++ b/MagickCore/resize.h @@ -31,9 +31,9 @@ extern MagickExport Image *MagnifyImage(const Image *,ExceptionInfo *), *MinifyImage(const Image *,ExceptionInfo *), *ResampleImage(const Image *,const double,const double,const FilterTypes, - const double,ExceptionInfo *), + ExceptionInfo *), *ResizeImage(const Image *,const size_t,const size_t,const FilterTypes, - const double,ExceptionInfo *), + ExceptionInfo *), *SampleImage(const Image *,const size_t,const size_t,ExceptionInfo *), *ScaleImage(const Image *,const size_t,const size_t,ExceptionInfo *), *ThumbnailImage(const Image *,const size_t,const size_t,ExceptionInfo *); diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 30adedc56..e94e51f5b 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -2071,7 +2071,7 @@ MagickExport MagickBooleanType TransformImage(Image **image, (transform_image->rows == geometry.height)) return(MagickTrue); resize_image=ResizeImage(transform_image,geometry.width,geometry.height, - transform_image->filter,transform_image->blur,exception); + transform_image->filter,exception); if (resize_image == (Image *) NULL) return(MagickFalse); transform_image=DestroyImage(transform_image); diff --git a/MagickCore/version.h b/MagickCore/version.h index 87fbb85ae..f7134078f 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -34,7 +34,7 @@ extern "C" { #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-03-22" +#define MagickReleaseDate "2012-03-25" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index a5a3ec196..ee5590bb3 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -213,7 +213,7 @@ WandExport void ProcessScriptOptions(MagickCLI *cli_wand,int argc,char **argv, { /* get option type and argument count */ const OptionInfo *option_info = GetCommandOptionInfo(option); count=option_info->type; - option_type=option_info->flags; + option_type=(CommandOptionFlags) option_info->flags; #if MagickCommandDebug >= 2 (void) FormatLocaleFile(stderr, "Script: %u,%u: \"%s\" matched \"%s\"\n", cli_wand->line, cli_wand->line, option, option_info->mnemonic ); @@ -420,7 +420,7 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand, int argc, { const OptionInfo *option_info = GetCommandOptionInfo(argv[i]); count=option_info->type; - option_type=option_info->flags; + option_type=(CommandOptionFlags) option_info->flags; #if MagickCommandDebug >= 2 (void) FormatLocaleFile(stderr, "CLI %d: \"%s\" matched \"%s\"\n", i, argv[i], option_info->mnemonic ); diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index ccfc24aa2..f9d11498b 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -176,7 +176,7 @@ WandExport Image *GetImageFromMagickWand(const MagickWand *wand) % The format of the MagickAdaptiveBlurImage method is: % % MagickBooleanType MagickAdaptiveBlurImage(MagickWand *wand, -% const double radius,const double sigma,const double bias) +% const double radius,const double sigma) % % A description of each parameter follows: % @@ -187,11 +187,9 @@ WandExport Image *GetImageFromMagickWand(const MagickWand *wand) % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickAdaptiveBlurImage(MagickWand *wand, - const double radius,const double sigma,const double bias) + const double radius,const double sigma) { Image *sharp_image; @@ -202,7 +200,7 @@ WandExport MagickBooleanType MagickAdaptiveBlurImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - sharp_image=AdaptiveBlurImage(wand->images,radius,sigma,bias,wand->exception); + sharp_image=AdaptiveBlurImage(wand->images,radius,sigma,wand->exception); if (sharp_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,sharp_image); @@ -275,7 +273,7 @@ WandExport MagickBooleanType MagickAdaptiveResizeImage(MagickWand *wand, % The format of the MagickAdaptiveSharpenImage method is: % % MagickBooleanType MagickAdaptiveSharpenImage(MagickWand *wand, -% const double radius,const double sigma,const double bias) +% const double radius,const double sigma) % % A description of each parameter follows: % @@ -286,11 +284,9 @@ WandExport MagickBooleanType MagickAdaptiveResizeImage(MagickWand *wand, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickAdaptiveSharpenImage(MagickWand *wand, - const double radius,const double sigma,const double bias) + const double radius,const double sigma) { Image *sharp_image; @@ -301,8 +297,7 @@ WandExport MagickBooleanType MagickAdaptiveSharpenImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - sharp_image=AdaptiveSharpenImage(wand->images,radius,sigma,bias, - wand->exception); + sharp_image=AdaptiveSharpenImage(wand->images,radius,sigma,wand->exception); if (sharp_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,sharp_image); @@ -907,7 +902,7 @@ WandExport MagickBooleanType MagickBlueShiftImage(MagickWand *wand, % The format of the MagickBlurImage method is: % % MagickBooleanType MagickBlurImage(MagickWand *wand,const double radius, -% const double sigmaconst double bias) +% const double sigma) % % A description of each parameter follows: % @@ -918,11 +913,9 @@ WandExport MagickBooleanType MagickBlueShiftImage(MagickWand *wand, % % o sigma: the standard deviation of the , in pixels. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickBlurImage(MagickWand *wand, - const double radius,const double sigma,const double bias) + const double radius,const double sigma) { Image *blur_image; @@ -933,7 +926,7 @@ WandExport MagickBooleanType MagickBlurImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - blur_image=BlurImage(wand->images,radius,sigma,bias,wand->exception); + blur_image=BlurImage(wand->images,radius,sigma,wand->exception); if (blur_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,blur_image); @@ -1119,7 +1112,7 @@ WandExport MagickWand *MagickChannelFxImage(MagickWand *wand, % The format of the MagickCharcoalImage method is: % % MagickBooleanType MagickCharcoalImage(MagickWand *wand, -% const double radius,const double sigma,const double bias) +% const double radius,const double sigma) % % A description of each parameter follows: % @@ -1130,11 +1123,9 @@ WandExport MagickWand *MagickChannelFxImage(MagickWand *wand, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickCharcoalImage(MagickWand *wand, - const double radius,const double sigma,const double bias) + const double radius,const double sigma) { Image *charcoal_image; @@ -1145,7 +1136,7 @@ WandExport MagickBooleanType MagickCharcoalImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - charcoal_image=CharcoalImage(wand->images,radius,sigma,bias,wand->exception); + charcoal_image=CharcoalImage(wand->images,radius,sigma,wand->exception); if (charcoal_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,charcoal_image); @@ -6770,8 +6761,7 @@ WandExport MagickBooleanType MagickMorphologyImage(MagickWand *wand, % The format of the MagickMotionBlurImage method is: % % MagickBooleanType MagickMotionBlurImage(MagickWand *wand, -% const double radius,const double sigma,const double angle, -% const double bias) +% const double radius,const double sigma,const double angle) % % A description of each parameter follows: % @@ -6786,7 +6776,7 @@ WandExport MagickBooleanType MagickMorphologyImage(MagickWand *wand, % */ WandExport MagickBooleanType MagickMotionBlurImage(MagickWand *wand, - const double radius,const double sigma,const double angle,const double bias) + const double radius,const double sigma,const double angle) { Image *blur_image; @@ -6797,8 +6787,7 @@ WandExport MagickBooleanType MagickMotionBlurImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - blur_image=MotionBlurImage(wand->images,radius,sigma,angle,bias, - wand->exception); + blur_image=MotionBlurImage(wand->images,radius,sigma,angle,wand->exception); if (blur_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,blur_image); @@ -7745,7 +7734,7 @@ WandExport MagickBooleanType MagickQuantizeImages(MagickWand *wand, % The format of the MagickRadialBlurImage method is: % % MagickBooleanType MagickRadialBlurImage(MagickWand *wand, -% const double angle,const double bias) +% const double angle) % % A description of each parameter follows: % @@ -7753,11 +7742,9 @@ WandExport MagickBooleanType MagickQuantizeImages(MagickWand *wand, % % o angle: the angle of the blur in degrees. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickRadialBlurImage(MagickWand *wand, - const double angle,const double bias) + const double angle) { Image *blur_image; @@ -7768,7 +7755,7 @@ WandExport MagickBooleanType MagickRadialBlurImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - blur_image=RadialBlurImage(wand->images,angle,bias,wand->exception); + blur_image=RadialBlurImage(wand->images,angle,wand->exception); if (blur_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,blur_image); @@ -8136,7 +8123,7 @@ WandExport MagickBooleanType MagickRemoveImage(MagickWand *wand) % % MagickBooleanType MagickResampleImage(MagickWand *wand, % const double x_resolution,const double y_resolution, -% const FilterTypes filter,const double blur) +% const FilterTypes filter) % % A description of each parameter follows: % @@ -8148,12 +8135,9 @@ WandExport MagickBooleanType MagickRemoveImage(MagickWand *wand) % % o filter: Image filter to use. % -% o blur: the blur factor where > 1 is blurry, < 1 is sharp. -% */ WandExport MagickBooleanType MagickResampleImage(MagickWand *wand, - const double x_resolution,const double y_resolution,const FilterTypes filter, - const double blur) + const double x_resolution,const double y_resolution,const FilterTypes filter) { Image *resample_image; @@ -8165,7 +8149,7 @@ WandExport MagickBooleanType MagickResampleImage(MagickWand *wand, if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); resample_image=ResampleImage(wand->images,x_resolution,y_resolution,filter, - blur,wand->exception); + wand->exception); if (resample_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,resample_image); @@ -8241,8 +8225,7 @@ WandExport MagickBooleanType MagickResetImagePage(MagickWand *wand, % The format of the MagickResizeImage method is: % % MagickBooleanType MagickResizeImage(MagickWand *wand, -% const size_t columns,const size_t rows, -% const FilterTypes filter,const double blur) +% const size_t columns,const size_t rows,const FilterTypes filter) % % A description of each parameter follows: % @@ -8254,12 +8237,9 @@ WandExport MagickBooleanType MagickResetImagePage(MagickWand *wand, % % o filter: Image filter to use. % -% o blur: the blur factor where > 1 is blurry, < 1 is sharp. -% */ WandExport MagickBooleanType MagickResizeImage(MagickWand *wand, - const size_t columns,const size_t rows,const FilterTypes filter, - const double blur) + const size_t columns,const size_t rows,const FilterTypes filter) { Image *resize_image; @@ -8270,8 +8250,7 @@ WandExport MagickBooleanType MagickResizeImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - resize_image=ResizeImage(wand->images,columns,rows,filter,blur, - wand->exception); + resize_image=ResizeImage(wand->images,columns,rows,filter,wand->exception); if (resize_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,resize_image); @@ -8546,8 +8525,7 @@ MagickExport MagickBooleanType MagickSegmentImage(MagickWand *wand, % The format of the MagickSelectiveBlurImage method is: % % MagickBooleanType MagickSelectiveBlurImage(MagickWand *wand, -% const double radius,const double sigma,const double threshold, -% const double bias) +% const double radius,const double sigma,const double threshold) % % A description of each parameter follows: % @@ -8561,12 +8539,9 @@ MagickExport MagickBooleanType MagickSegmentImage(MagickWand *wand, % o threshold: only pixels within this contrast threshold are included % in the blur operation. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickSelectiveBlurImage(MagickWand *wand, - const double radius,const double sigma,const double threshold, - const double bias) + const double radius,const double sigma,const double threshold) { Image *blur_image; @@ -8577,7 +8552,7 @@ WandExport MagickBooleanType MagickSelectiveBlurImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - blur_image=SelectiveBlurImage(wand->images,radius,sigma,threshold,bias, + blur_image=SelectiveBlurImage(wand->images,radius,sigma,threshold, wand->exception); if (blur_image == (Image *) NULL) return(MagickFalse); @@ -8810,45 +8785,6 @@ WandExport MagickBooleanType MagickSetImageBackgroundColor(MagickWand *wand, % % % % % % -% M a g i c k S e t I m a g e B i a s % -% % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% MagickSetImageBias() sets the image bias for any method that convolves an -% image (e.g. MagickConvolveImage()). -% -% The format of the MagickSetImageBias method is: -% -% MagickBooleanType MagickSetImageBias(MagickWand *wand, -% const double bias) -% -% A description of each parameter follows: -% -% o wand: the magick wand. -% -% o bias: the image bias. -% -*/ -WandExport MagickBooleanType MagickSetImageBias(MagickWand *wand, - const double bias) -{ - assert(wand != (MagickWand *) NULL); - assert(wand->signature == WandSignature); - if (wand->debug != MagickFalse) - (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - if (wand->images == (Image *) NULL) - ThrowWandException(WandError,"ContainsNoImages",wand->name); - wand->images->bias=bias; - return(MagickTrue); -} - -/* -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % % M a g i c k S e t I m a g e B l u e P r i m a r y % % % % % @@ -10409,9 +10345,8 @@ WandExport MagickBooleanType MagickShadeImage(MagickWand *wand, % % The format of the MagickShadowImage method is: % -% MagickBooleanType MagickShadowImage(MagickWand *wand, -% const double alpha,const double sigma,const double bias, -% const ssize_t x,const ssize_t y) +% MagickBooleanType MagickShadowImage(MagickWand *wand,const double alpha, +% const double sigma,const ssize_t x,const ssize_t y) % % A description of each parameter follows: % @@ -10421,16 +10356,13 @@ WandExport MagickBooleanType MagickShadeImage(MagickWand *wand, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% % o x: the shadow x-offset. % % o y: the shadow y-offset. % */ WandExport MagickBooleanType MagickShadowImage(MagickWand *wand, - const double alpha,const double sigma,const double bias,const ssize_t x, - const ssize_t y) + const double alpha,const double sigma,const ssize_t x,const ssize_t y) { Image *shadow_image; @@ -10441,7 +10373,7 @@ WandExport MagickBooleanType MagickShadowImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - shadow_image=ShadowImage(wand->images,alpha,sigma,bias,x,y,wand->exception); + shadow_image=ShadowImage(wand->images,alpha,sigma,x,y,wand->exception); if (shadow_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,shadow_image); @@ -10467,7 +10399,7 @@ WandExport MagickBooleanType MagickShadowImage(MagickWand *wand, % The format of the MagickSharpenImage method is: % % MagickBooleanType MagickSharpenImage(MagickWand *wand, -% const double radius,const double sigma,const double bias) +% const double radius,const double sigma) % % A description of each parameter follows: % @@ -10478,11 +10410,9 @@ WandExport MagickBooleanType MagickShadowImage(MagickWand *wand, % % o sigma: the standard deviation of the Gaussian, in pixels. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickSharpenImage(MagickWand *wand, - const double radius,const double sigma,const double bias) + const double radius,const double sigma) { Image *sharp_image; @@ -10493,7 +10423,7 @@ WandExport MagickBooleanType MagickSharpenImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - sharp_image=SharpenImage(wand->images,radius,sigma,bias,wand->exception); + sharp_image=SharpenImage(wand->images,radius,sigma,wand->exception); if (sharp_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,sharp_image); @@ -10745,8 +10675,7 @@ WandExport MagickWand *MagickSimilarityImage(MagickWand *wand, % The format of the MagickSketchImage method is: % % MagickBooleanType MagickSketchImage(MagickWand *wand, -% const double radius,const double sigma,const double angle, -% const double bias) +% const double radius,const double sigma,const double angle) % % A description of each parameter follows: % @@ -10759,11 +10688,9 @@ WandExport MagickWand *MagickSimilarityImage(MagickWand *wand, % % o angle: apply the effect along this angle. % -% o bias: the bias. -% */ WandExport MagickBooleanType MagickSketchImage(MagickWand *wand, - const double radius,const double sigma,const double angle,const double bias) + const double radius,const double sigma,const double angle) { Image *sketch_image; @@ -10774,8 +10701,7 @@ WandExport MagickBooleanType MagickSketchImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - sketch_image=SketchImage(wand->images,radius,sigma,angle,bias, - wand->exception); + sketch_image=SketchImage(wand->images,radius,sigma,angle,wand->exception); if (sketch_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,sketch_image); @@ -11928,8 +11854,8 @@ WandExport MagickBooleanType MagickUnsharpMaskImage(MagickWand *wand, % The format of the MagickVignetteImage method is: % % MagickBooleanType MagickVignetteImage(MagickWand *wand, -% const double radius,const double sigma,const double bias, -% const ssize_t x,const ssize_t y) +% const double radius,const double sigma,const ssize_t x, +% const ssize_t y) % % A description of each parameter follows: % @@ -11939,14 +11865,11 @@ WandExport MagickBooleanType MagickUnsharpMaskImage(MagickWand *wand, % % o sigma: the sigma. % -% o bias: the bias. -% % o x, y: Define the x and y ellipse offset. % */ WandExport MagickBooleanType MagickVignetteImage(MagickWand *wand, - const double radius,const double sigma,const double bias,const ssize_t x, - const ssize_t y) + const double radius,const double sigma,const ssize_t x,const ssize_t y) { Image *vignette_image; @@ -11957,8 +11880,7 @@ WandExport MagickBooleanType MagickVignetteImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - vignette_image=VignetteImage(wand->images,radius,sigma,bias,x,y, - wand->exception); + vignette_image=VignetteImage(wand->images,radius,sigma,x,y,wand->exception); if (vignette_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,vignette_image); diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h index 7069a62c1..ba8763e6c 100644 --- a/MagickWand/magick-image.h +++ b/MagickWand/magick-image.h @@ -71,10 +71,9 @@ extern WandExport PixelInterpolateMethod MagickGetImagePixelInterpolateMethod(MagickWand *); extern WandExport MagickBooleanType - MagickAdaptiveBlurImage(MagickWand *,const double,const double,const double), + MagickAdaptiveBlurImage(MagickWand *,const double,const double), MagickAdaptiveResizeImage(MagickWand *,const size_t,const size_t), - MagickAdaptiveSharpenImage(MagickWand *,const double,const double, - const double), + MagickAdaptiveSharpenImage(MagickWand *,const double,const double), MagickAdaptiveThresholdImage(MagickWand *,const size_t,const size_t, const double), MagickAddImage(MagickWand *,const MagickWand *), @@ -87,11 +86,11 @@ extern WandExport MagickBooleanType MagickAutoLevelImage(MagickWand *), MagickBlackThresholdImage(MagickWand *,const PixelWand *), MagickBlueShiftImage(MagickWand *,const double), - MagickBlurImage(MagickWand *,const double,const double,const double), + MagickBlurImage(MagickWand *,const double,const double), MagickBorderImage(MagickWand *,const PixelWand *,const size_t,const size_t, const CompositeOperator compose), MagickBrightnessContrastImage(MagickWand *,const double,const double), - MagickCharcoalImage(MagickWand *,const double,const double,const double), + MagickCharcoalImage(MagickWand *,const double,const double), MagickChopImage(MagickWand *,const size_t,const size_t,const ssize_t, const ssize_t), MagickClampImage(MagickWand *), @@ -186,8 +185,7 @@ extern WandExport MagickBooleanType MagickModulateImage(MagickWand *,const double,const double,const double), MagickMorphologyImage(MagickWand *,MorphologyMethod,const ssize_t, KernelInfo *), - MagickMotionBlurImage(MagickWand *,const double,const double,const double, - const double), + MagickMotionBlurImage(MagickWand *,const double,const double,const double), MagickNegateImage(MagickWand *,const MagickBooleanType), MagickNewImage(MagickWand *,const size_t,const size_t,const PixelWand *), MagickNextImage(MagickWand *), @@ -209,7 +207,7 @@ extern WandExport MagickBooleanType const size_t,const MagickBooleanType,const MagickBooleanType), MagickQuantizeImages(MagickWand *,const size_t,const ColorspaceType, const size_t,const MagickBooleanType,const MagickBooleanType), - MagickRadialBlurImage(MagickWand *,const double,const double), + MagickRadialBlurImage(MagickWand *,const double), MagickRaiseImage(MagickWand *,const size_t,const size_t,const ssize_t, const ssize_t,const MagickBooleanType), MagickRandomThresholdImage(MagickWand *,const double,const double), @@ -219,25 +217,21 @@ extern WandExport MagickBooleanType MagickReduceNoiseImage(MagickWand *,const double), MagickRemapImage(MagickWand *,const MagickWand *,const DitherMethod), MagickRemoveImage(MagickWand *), - MagickResampleImage(MagickWand *,const double,const double,const FilterTypes, - const double), + MagickResampleImage(MagickWand *,const double,const double,const FilterTypes), MagickResetImagePage(MagickWand *,const char *), - MagickResizeImage(MagickWand *,const size_t,const size_t,const FilterTypes, - const double), + MagickResizeImage(MagickWand *,const size_t,const size_t,const FilterTypes), MagickRollImage(MagickWand *,const ssize_t,const ssize_t), MagickRotateImage(MagickWand *,const PixelWand *,const double), MagickSampleImage(MagickWand *,const size_t,const size_t), MagickScaleImage(MagickWand *,const size_t,const size_t), MagickSegmentImage(MagickWand *,const ColorspaceType,const MagickBooleanType, const double,const double), - MagickSelectiveBlurImage(MagickWand *,const double,const double,const double, - const double), + MagickSelectiveBlurImage(MagickWand *,const double,const double,const double), MagickSeparateImage(MagickWand *,const ChannelType), MagickSepiaToneImage(MagickWand *,const double), MagickSetImage(MagickWand *,const MagickWand *), MagickSetImageAlphaChannel(MagickWand *,const AlphaChannelType), MagickSetImageBackgroundColor(MagickWand *,const PixelWand *), - MagickSetImageBias(MagickWand *,const double), MagickSetImageBluePrimary(MagickWand *,const double,const double), MagickSetImageBorderColor(MagickWand *,const PixelWand *), MagickSetImageClipMask(MagickWand *,const MagickWand *), @@ -277,15 +271,14 @@ extern WandExport MagickBooleanType MagickSetImageWhitePoint(MagickWand *,const double,const double), MagickShadeImage(MagickWand *,const MagickBooleanType,const double, const double), - MagickShadowImage(MagickWand *,const double,const double,const double, - const ssize_t,const ssize_t), - MagickSharpenImage(MagickWand *,const double,const double,const double), + MagickShadowImage(MagickWand *,const double,const double,const ssize_t, + const ssize_t), + MagickSharpenImage(MagickWand *,const double,const double), MagickShaveImage(MagickWand *,const size_t,const size_t), MagickShearImage(MagickWand *,const PixelWand *,const double,const double), MagickSigmoidalContrastImage(MagickWand *,const MagickBooleanType, const double,const double), - MagickSketchImage(MagickWand *,const double,const double,const double, - const double), + MagickSketchImage(MagickWand *,const double,const double,const double), MagickSolarizeImage(MagickWand *,const double), MagickSparseColorImage(MagickWand *,const SparseColorMethod,const size_t, const double *), @@ -307,8 +300,8 @@ extern WandExport MagickBooleanType MagickUniqueImageColors(MagickWand *), MagickUnsharpMaskImage(MagickWand *,const double,const double,const double, const double), - MagickVignetteImage(MagickWand *,const double,const double,const double, - const ssize_t,const ssize_t), + MagickVignetteImage(MagickWand *,const double,const double,const ssize_t, + const ssize_t), MagickWaveImage(MagickWand *,const double,const double, const PixelInterpolateMethod), MagickWhiteThresholdImage(MagickWand *,const PixelWand *), diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 08b461678..0d580a306 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -54,7 +54,7 @@ #include "MagickCore/string-private.h" #include "MagickCore/thread-private.h" #include "MagickCore/utility-private.h" - +cache /* Constant declaration. */ @@ -749,10 +749,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; - if ((flags & XiValue) == 0) - geometry_info.xi=0.0; mogrify_image=AdaptiveBlurImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,exception); + geometry_info.sigma,exception); break; } if (LocaleCompare("adaptive-resize",option+1) == 0) @@ -775,10 +773,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, flags=ParseGeometry(argv[i+1],&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; - if ((flags & XiValue) == 0) - geometry_info.xi=0.0; mogrify_image=AdaptiveSharpenImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,exception); + geometry_info.sigma,exception); break; } if (LocaleCompare("affine",option+1) == 0) @@ -959,7 +955,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & XiValue) == 0) geometry_info.xi=0.0; mogrify_image=BlurImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,exception); + geometry_info.sigma,exception); break; } if (LocaleCompare("border",option+1) == 0) @@ -1049,7 +1045,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & XiValue) == 0) geometry_info.xi=1.0; mogrify_image=CharcoalImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,exception); + geometry_info.sigma,exception); break; } if (LocaleCompare("chop",option+1) == 0) @@ -1254,7 +1250,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, kernel_info=AcquireKernelInfo(argv[i+1]); if (kernel_info == (KernelInfo *) NULL) break; - kernel_info->bias=(*image)->bias; mogrify_image=ConvolveImage(*image,kernel_info,exception); kernel_info=DestroyKernelInfo(kernel_info); break; @@ -1785,7 +1780,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, (void) CloneString(&(*image)->geometry,argv[i+1]); else mogrify_image=ResizeImage(*image,geometry.width,geometry.height, - (*image)->filter,(*image)->blur,exception); + (*image)->filter,exception); break; } if (LocaleCompare("gravity",option+1) == 0) @@ -2188,7 +2183,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; mogrify_image=MotionBlurImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception); + geometry_info.sigma,geometry_info.xi,exception); break; } break; @@ -2420,8 +2415,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, */ (void) SyncImageSettings(mogrify_info,*image,exception); flags=ParseGeometry(argv[i+1],&geometry_info); - mogrify_image=RadialBlurImage(*image,geometry_info.rho, - geometry_info.sigma,exception); + mogrify_image=RadialBlurImage(*image,geometry_info.rho,exception); break; } if (LocaleCompare("raise",option+1) == 0) @@ -2519,7 +2513,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; mogrify_image=ResampleImage(*image,geometry_info.rho, - geometry_info.sigma,(*image)->filter,(*image)->blur,exception); + geometry_info.sigma,(*image)->filter,exception); break; } if (LocaleCompare("resize",option+1) == 0) @@ -2530,7 +2524,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, (void) SyncImageSettings(mogrify_info,*image,exception); (void) ParseRegionGeometry(*image,argv[i+1],&geometry,exception); mogrify_image=ResizeImage(*image,geometry.width,geometry.height, - (*image)->filter,(*image)->blur,exception); + (*image)->filter,exception); break; } if (LocaleCompare("roll",option+1) == 0) @@ -2605,7 +2599,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & PercentValue) != 0) geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0; mogrify_image=SelectiveBlurImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception); + geometry_info.sigma,geometry_info.xi,exception); break; } if (LocaleCompare("separate",option+1) == 0) @@ -2713,9 +2707,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & PsiValue) == 0) geometry_info.psi=4.0; mogrify_image=ShadowImage(*image,geometry_info.rho, - geometry_info.sigma,(*image)->bias,(ssize_t) - ceil(geometry_info.xi-0.5),(ssize_t) ceil(geometry_info.psi-0.5), - exception); + geometry_info.sigma,(ssize_t) ceil(geometry_info.xi-0.5), + (ssize_t) ceil(geometry_info.psi-0.5),exception); break; } if (LocaleCompare("sharpen",option+1) == 0) @@ -2730,7 +2723,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & XiValue) == 0) geometry_info.xi=0.0; mogrify_image=SharpenImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,exception); + geometry_info.sigma,exception); break; } if (LocaleCompare("shave",option+1) == 0) @@ -2783,7 +2776,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; mogrify_image=SketchImage(*image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception); + geometry_info.sigma,geometry_info.xi,exception); break; } if (LocaleCompare("solarize",option+1) == 0) @@ -3122,9 +3115,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, if ((flags & PsiValue) == 0) geometry_info.psi=0.1*(*image)->rows; mogrify_image=VignetteImage(*image,geometry_info.rho, - geometry_info.sigma,(*image)->bias,(ssize_t) - ceil(geometry_info.xi-0.5),(ssize_t) ceil(geometry_info.psi-0.5), - exception); + geometry_info.sigma,(ssize_t) ceil(geometry_info.xi-0.5), + (ssize_t) ceil(geometry_info.psi-0.5),exception); break; } if (LocaleCompare("virtual-pixel",option+1) == 0) diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 1226b9991..3bf61ae13 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -971,7 +971,7 @@ WandExport void CLISettingOptionInfo(MagickCLI *cli_wand, if (parse < 0) CLIWandExceptArgBreak(OptionError,"UnrecognizedEndianType", option,arg1); - _image_info->endian=(EndianType) arg1; + _image_info->endian=(EndianType) (*arg1); (void) SetImageOption(_image_info,option+1,arg1); break; } @@ -1789,10 +1789,8 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, flags=ParseGeometry(arg1,&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; - if ((flags & XiValue) == 0) - geometry_info.xi=0.0; new_image=AdaptiveBlurImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,_exception); + geometry_info.sigma,_exception); break; } if (LocaleCompare("adaptive-resize",option+1) == 0) @@ -1802,7 +1800,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); (void) ParseRegionGeometry(_image,arg1,&geometry,_exception); new_image=AdaptiveResizeImage(_image,geometry.width,geometry.height, - _exception); + _exception); break; } if (LocaleCompare("adaptive-sharpen",option+1) == 0) @@ -1812,10 +1810,8 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, flags=ParseGeometry(arg1,&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; - if ((flags & XiValue) == 0) - geometry_info.xi=0.0; new_image=AdaptiveSharpenImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,_exception); + geometry_info.sigma,_exception); break; } if (LocaleCompare("alpha",option+1) == 0) @@ -1942,16 +1938,13 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, } if (LocaleCompare("blur",option+1) == 0) { - /* FUTURE: use of "bias" in a blur is non-sensible */ if (IsGeometry(arg1) == MagickFalse) CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); flags=ParseGeometry(arg1,&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; - if ((flags & XiValue) == 0) - geometry_info.xi=0.0; - new_image=BlurImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,_exception); + new_image=BlurImage(_image,geometry_info.rho,geometry_info.sigma, + _exception); break; } if (LocaleCompare("border",option+1) == 0) @@ -2030,7 +2023,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & XiValue) == 0) geometry_info.xi=1.0; new_image=CharcoalImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,_exception); + geometry_info.sigma,_exception); break; } if (LocaleCompare("chop",option+1) == 0) @@ -2205,7 +2198,6 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, kernel_info=AcquireKernelInfo(arg1); if (kernel_info == (KernelInfo *) NULL) CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); - kernel_info->bias=_image->bias; new_image=ConvolveImage(_image,kernel_info,_exception); kernel_info=DestroyKernelInfo(kernel_info); break; @@ -2616,7 +2608,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, (void) CloneString(&_image->geometry,arg1); else new_image=ResizeImage(_image,geometry.width,geometry.height, - _image->filter,_image->blur,_exception); + _image->filter,_exception); break; } CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option); @@ -2929,8 +2921,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; new_image=MotionBlurImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi, - _exception); + geometry_info.sigma,geometry_info.xi,_exception); break; } CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option); @@ -3129,8 +3120,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, if (IsGeometry(arg1) == MagickFalse) CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); flags=ParseGeometry(arg1,&geometry_info); - new_image=RadialBlurImage(_image,geometry_info.rho, - geometry_info.sigma,_exception); + new_image=RadialBlurImage(_image,geometry_info.rho,_exception); break; } if (LocaleCompare("raise",option+1) == 0) @@ -3177,25 +3167,23 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, } if (LocaleCompare("resample",option+1) == 0) { - /* FUTURE: remove blur arguemnt - no longer used - Roll into a resize special operation */ + /* Roll into a resize special operation */ if (IsGeometry(arg1) == MagickFalse) CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); flags=ParseGeometry(arg1,&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; new_image=ResampleImage(_image,geometry_info.rho, - geometry_info.sigma,_image->filter,_image->blur,_exception); + geometry_info.sigma,_image->filter,_exception); break; } if (LocaleCompare("resize",option+1) == 0) { - /* FUTURE: remove blur argument - no longer used */ if (IsGeometry(arg1) == MagickFalse) CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); (void) ParseRegionGeometry(_image,arg1,&geometry,_exception); new_image=ResizeImage(_image,geometry.width,geometry.height, - _image->filter,_image->blur,_exception); + _image->filter,_exception); break; } if (LocaleCompare("roll",option+1) == 0) @@ -3264,7 +3252,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & PercentValue) != 0) geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0; new_image=SelectiveBlurImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception); + geometry_info.sigma,geometry_info.xi,_exception); break; } if (LocaleCompare("separate",option+1) == 0) @@ -3338,10 +3326,9 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, geometry_info.xi=4.0; if ((flags & PsiValue) == 0) geometry_info.psi=4.0; - new_image=ShadowImage(_image,geometry_info.rho, - geometry_info.sigma,_image->bias,(ssize_t) - ceil(geometry_info.xi-0.5),(ssize_t) ceil(geometry_info.psi-0.5), - _exception); + new_image=ShadowImage(_image,geometry_info.rho,geometry_info.sigma, + (ssize_t) ceil(geometry_info.xi-0.5),(ssize_t) + ceil(geometry_info.psi-0.5),_exception); break; } if (LocaleCompare("sharpen",option+1) == 0) @@ -3353,8 +3340,8 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, geometry_info.sigma=1.0; if ((flags & XiValue) == 0) geometry_info.xi=0.0; - new_image=SharpenImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,_exception); + new_image=SharpenImage(_image,geometry_info.rho,geometry_info.sigma, + _exception); break; } if (LocaleCompare("shave",option+1) == 0) @@ -3399,7 +3386,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & SigmaValue) == 0) geometry_info.sigma=1.0; new_image=SketchImage(_image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception); + geometry_info.sigma,geometry_info.xi,_exception); break; } if (LocaleCompare("solarize",option+1) == 0) @@ -3597,8 +3584,8 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & PsiValue) == 0) geometry_info.psi=0.1*_image->rows; new_image=VignetteImage(_image,geometry_info.rho,geometry_info.sigma, - _image->bias,(ssize_t) ceil(geometry_info.xi-0.5), - (ssize_t) ceil(geometry_info.psi-0.5),_exception); + (ssize_t) ceil(geometry_info.xi-0.5),(ssize_t) + ceil(geometry_info.psi-0.5),_exception); break; } CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option); @@ -4576,7 +4563,7 @@ WandExport void CLISpecialOperator(MagickCLI *cli_wand, Stack *node; - node = (void *)cli_wand->image_list_stack; + node = (Stack *)cli_wand->image_list_stack; if ( node == (Stack *)NULL) CLIWandExceptionReturn(OptionError,"UnbalancedParenthesis",option); cli_wand->image_list_stack = node->next; @@ -4603,7 +4590,7 @@ WandExport void CLISpecialOperator(MagickCLI *cli_wand, Stack *node; - node = (void *)cli_wand->image_info_stack; + node = (Stack *)cli_wand->image_info_stack; if ( node == (Stack *)NULL) CLIWandExceptionReturn(OptionError,"UnbalancedCurlyBraces",option); cli_wand->image_info_stack = node->next; diff --git a/MagickWand/script-token.c b/MagickWand/script-token.c index 8e437964b..2420e6f7e 100644 --- a/MagickWand/script-token.c +++ b/MagickWand/script-token.c @@ -140,7 +140,7 @@ WandExport ScriptTokenInfo * DestroyScriptTokenInfo(ScriptTokenInfo *token_info) fclose(token_info->stream); if (token_info->token != (char *) NULL ) - token_info->token=RelinquishMagickMemory(token_info->token); + token_info->token=(char *) RelinquishMagickMemory(token_info->token); token_info=(ScriptTokenInfo *) RelinquishMagickMemory(token_info); return(token_info); } diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 7cfecc978..8fb5a1077 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -214,8 +214,7 @@ static struct {"bordercolor", StringReference}, {"color", StringReference}, {"compose", MagickComposeOptions} } }, { "Blur", { {"geometry", StringReference}, {"radius", RealReference}, - {"sigma", RealReference}, {"bias", RealReference}, - {"channel", MagickChannelOptions} } }, + {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, { "Chop", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"x", IntegerReference}, {"y", IntegerReference} } }, @@ -256,8 +255,7 @@ static struct { "Shade", { {"geometry", StringReference}, {"azimuth", RealReference}, {"elevation", RealReference}, {"gray", MagickBooleanOptions} } }, { "Sharpen", { {"geometry", StringReference}, {"radius", RealReference}, - {"sigma", RealReference}, {"bias", RealReference}, - {"channel", MagickChannelOptions} } }, + {"sigma", RealReference}, {"channel", MagickChannelOptions} } }, { "Shear", { {"geometry", StringReference}, {"x", RealReference}, {"y", RealReference}, { "fill", StringReference}, {"color", StringReference} } }, @@ -267,10 +265,10 @@ static struct {"interpolate", MagickInterpolateOptions} } }, { "Resize", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"filter", MagickFilterOptions}, - {"support", StringReference }, {"blur", RealReference } } }, + {"support", StringReference } } }, { "Zoom", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, {"filter", MagickFilterOptions}, - {"support", RealReference }, {"blur", RealReference } } }, + {"support", RealReference } } }, { "Annotate", { {"text", StringReference}, {"font", StringReference}, {"pointsize", RealReference}, {"density", StringReference}, {"undercolor", StringReference}, {"stroke", StringReference}, @@ -370,7 +368,7 @@ static struct { "Threshold", { {"threshold", StringReference}, {"channel", MagickChannelOptions} } }, { "Charcoal", { {"geometry", StringReference}, {"radius", RealReference}, - {"sigma", RealReference}, {"biabias", RealReference} } }, + {"sigma", RealReference} } }, { "Trim", { {"fuzz", StringReference} } }, { "Wave", { {"geometry", StringReference}, {"amplitude", RealReference}, {"wavelength", RealReference}, @@ -396,8 +394,7 @@ static struct {"channel", MagickChannelOptions} } }, { "MotionBlur", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, - {"angle", RealReference}, {"bias", RealReference}, - {"channel", MagickChannelOptions} } }, + {"angle", RealReference}, {"channel", MagickChannelOptions} } }, { "OrderedDither", { {"threshold", StringReference}, {"channel", MagickChannelOptions} } }, { "Shave", { {"geometry", StringReference}, {"width", IntegerReference}, @@ -413,18 +410,17 @@ static struct {"background", StringReference} } }, { "Difference", { {"image", ImageReference}, {"fuzz", StringReference} } }, { "AdaptiveThreshold", { {"geometry", StringReference}, - {"width", IntegerReference}, {"height", IntegerReference}, - {"bias", RealReference} } }, + {"width", IntegerReference}, {"height", IntegerReference} } }, { "Resample", { {"density", StringReference}, {"x", RealReference}, {"y", RealReference}, {"filter", MagickFilterOptions}, - {"support", RealReference }, {"blur", RealReference } } }, + {"support", RealReference } } }, { "Describe", { {"file", FileReference} } }, { "BlackThreshold", { {"threshold", StringReference}, {"channel", MagickChannelOptions} } }, { "WhiteThreshold", { {"threshold", StringReference}, {"channel", MagickChannelOptions} } }, { "RadialBlur", { {"geometry", StringReference}, {"angle", RealReference}, - {"bias", RealReference}, {"channel", MagickChannelOptions} } }, + {"channel", MagickChannelOptions} } }, { "Thumbnail", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference} } }, { "Strip", }, @@ -465,10 +461,10 @@ static struct { "AutoOrient", }, { "AdaptiveBlur", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, - {"bias", RealReference}, {"channel", MagickChannelOptions} } }, + {"channel", MagickChannelOptions} } }, { "Sketch", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, - {"angle", RealReference}, {"bias", RealReference} } }, + {"angle", RealReference} } }, { "UniqueColors", }, { "AdaptiveResize", { {"geometry", StringReference}, {"width", IntegerReference}, {"height", IntegerReference}, @@ -514,8 +510,7 @@ static struct {"virtual-pixel", MagickVirtualPixelOptions} } }, { "SelectiveBlur", { {"geometry", StringReference}, {"radius", RealReference}, {"sigma", RealReference}, - {"threshold", RealReference}, {"bias", RealReference}, - {"channel", MagickChannelOptions} } }, + {"threshold", RealReference}, {"channel", MagickChannelOptions} } }, { "HaldClut", { {"image", ImageReference}, {"channel", MagickChannelOptions} } }, { "BlueShift", { {"factor", StringReference} } }, @@ -1178,13 +1173,6 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, image->background_color=target_color; break; } - if (LocaleCompare(attribute,"bias") == 0) - { - for ( ; image; image=image->next) - image->bias=StringToDoubleInterval(SvPV(sval,na),(double) - QuantumRange+1.0); - break; - } if (LocaleCompare(attribute,"blue-primary") == 0) { for ( ; image; image=image->next) @@ -4526,13 +4514,6 @@ Get(ref,...) PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; } - if (LocaleCompare(attribute,"bias") == 0) - { - if (image != (Image *) NULL) - s=newSVnv(image->bias); - PUSHs(s ? sv_2mortal(s) : &sv_undef); - continue; - } if (LocaleCompare(attribute,"blue-primary") == 0) { if (image == (Image *) NULL) @@ -7748,12 +7729,10 @@ Mogrify(ref,...) if (attribute_flag[2] != 0) geometry_info.sigma=argument_list[2].real_reference; if (attribute_flag[3] != 0) - geometry_info.xi=argument_list[3].real_reference; - if (attribute_flag[4] != 0) - channel=(ChannelType) argument_list[4].integer_reference; + channel=(ChannelType) argument_list[3].integer_reference; channel_mask=SetPixelChannelMask(image,channel); image=BlurImage(image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,exception); + exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); break; @@ -8046,12 +8025,10 @@ Mogrify(ref,...) if (attribute_flag[2] != 0) geometry_info.sigma=argument_list[2].real_reference; if (attribute_flag[3] != 0) - geometry_info.xi=argument_list[3].real_reference; - if (attribute_flag[4] != 0) - channel=(ChannelType) argument_list[4].integer_reference; + channel=(ChannelType) argument_list[3].integer_reference; channel_mask=SetPixelChannelMask(image,channel); image=SharpenImage(image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,exception); + exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); break; @@ -8122,11 +8099,9 @@ Mogrify(ref,...) if (attribute_flag[4] != 0) SetImageArtifact(image,"filter:support", argument_list[4].string_reference); - if (attribute_flag[5] == 0) - argument_list[5].real_reference=1.0; image=ResizeImage(image,geometry.width,geometry.height, (FilterTypes) argument_list[3].integer_reference, - argument_list[5].real_reference,exception); + exception); break; } case 33: /* Annotate */ @@ -9263,10 +9238,8 @@ Mogrify(ref,...) geometry_info.rho=argument_list[1].real_reference; if (attribute_flag[2] != 0) geometry_info.sigma=argument_list[2].real_reference; - if (attribute_flag[3] != 0) - geometry_info.xi=argument_list[3].real_reference; image=CharcoalImage(image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,exception); + exception); break; } case 59: /* Trim */ @@ -9404,8 +9377,8 @@ Mogrify(ref,...) if (attribute_flag[1] != 0) channel=(ChannelType) argument_list[1].integer_reference; if (attribute_flag[2] != 0) - image->bias=StringToDoubleInterval( - argument_list[2].string_reference,(double) QuantumRange+1.0); + SetImageArtifact(image,"filter:blur", + argument_list[2].string_reference); if (attribute_flag[3] != 0) { kernel=AcquireKernelInfo(argument_list[3].string_reference); @@ -9413,7 +9386,6 @@ Mogrify(ref,...) break; } channel_mask=SetPixelChannelMask(image,channel); - kernel->bias=image->bias; image=ConvolveImage(image,kernel,exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); @@ -9538,12 +9510,10 @@ Mogrify(ref,...) if (attribute_flag[3] != 0) geometry_info.xi=argument_list[3].real_reference; if (attribute_flag[4] != 0) - geometry_info.psi=argument_list[4].real_reference; - if (attribute_flag[5] != 0) - channel=(ChannelType) argument_list[5].integer_reference; + channel=(ChannelType) argument_list[4].integer_reference; channel_mask=SetPixelChannelMask(image,channel); image=MotionBlurImage(image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,geometry_info.psi,exception); + geometry_info.xi,exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); break; @@ -9803,15 +9773,12 @@ Mogrify(ref,...) if (attribute_flag[4] == 0) SetImageArtifact(image,"filter:support", argument_list[4].string_reference); - if (attribute_flag[5] != 0) - argument_list[5].real_reference=1.0; width=(size_t) (geometry_info.rho*image->columns/ (image->resolution.x == 0.0 ? 72.0 : image->resolution.x)+0.5); height=(size_t) (geometry_info.sigma*image->rows/ (image->resolution.y == 0.0 ? 72.0 : image->resolution.y)+0.5); image=ResizeImage(image,width,height,(FilterTypes) - argument_list[3].integer_reference,argument_list[5].real_reference, - exception); + argument_list[3].integer_reference,exception); if (image != (Image *) NULL) { image->resolution.x=geometry_info.rho; @@ -9864,12 +9831,9 @@ Mogrify(ref,...) if (attribute_flag[1] != 0) geometry_info.rho=argument_list[1].real_reference; if (attribute_flag[2] != 0) - geometry_info.sigma=argument_list[2].real_reference; - if (attribute_flag[3] != 0) - channel=(ChannelType) argument_list[3].integer_reference; + channel=(ChannelType) argument_list[2].integer_reference; channel_mask=SetPixelChannelMask(image,channel); - image=RadialBlurImage(image,geometry_info.rho,geometry_info.sigma, - exception); + image=RadialBlurImage(image,geometry_info.rho,exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); break; @@ -9969,7 +9933,7 @@ Mogrify(ref,...) geometry_info.xi=argument_list[3].integer_reference; if (attribute_flag[4] != 0) geometry_info.psi=argument_list[4].integer_reference; - image=ShadowImage(image,geometry_info.rho,geometry_info.sigma,0.0, + image=ShadowImage(image,geometry_info.rho,geometry_info.sigma, (ssize_t) ceil(geometry_info.xi-0.5),(ssize_t) ceil(geometry_info.psi-0.5),exception); break; @@ -10084,7 +10048,7 @@ Mogrify(ref,...) if (attribute_flag[5] != 0) (void) QueryColorCompliance(argument_list[5].string_reference, AllCompliance,&image->background_color,exception); - image=VignetteImage(image,geometry_info.rho,geometry_info.sigma,0.0, + image=VignetteImage(image,geometry_info.rho,geometry_info.sigma, (ssize_t) ceil(geometry_info.xi-0.5),(ssize_t) ceil(geometry_info.psi-0.5),exception); break; @@ -10152,7 +10116,7 @@ Mogrify(ref,...) channel=(ChannelType) argument_list[4].integer_reference; channel_mask=SetPixelChannelMask(image,channel); image=AdaptiveSharpenImage(image,geometry_info.rho, - geometry_info.sigma,geometry_info.xi,exception); + geometry_info.sigma,exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); break; @@ -10227,12 +10191,10 @@ Mogrify(ref,...) if (attribute_flag[2] != 0) geometry_info.sigma=argument_list[2].real_reference; if (attribute_flag[3] != 0) - geometry_info.xi=argument_list[3].real_reference; - if (attribute_flag[4] != 0) - channel=(ChannelType) argument_list[4].integer_reference; + channel=(ChannelType) argument_list[3].integer_reference; channel_mask=SetPixelChannelMask(image,channel); image=AdaptiveBlurImage(image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,exception); + exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); break; @@ -10254,10 +10216,8 @@ Mogrify(ref,...) geometry_info.sigma=argument_list[2].real_reference; if (attribute_flag[3] != 0) geometry_info.xi=argument_list[3].real_reference; - if (attribute_flag[4] != 0) - geometry_info.psi=argument_list[4].real_reference; image=SketchImage(image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,geometry_info.psi,exception); + geometry_info.xi,exception); break; } case 104: /* UniqueColors */ @@ -10279,8 +10239,6 @@ Mogrify(ref,...) if (attribute_flag[4] != 0) SetImageArtifact(image,"filter:support", argument_list[4].string_reference); - if (attribute_flag[5] != 0) - image->blur=argument_list[5].real_reference; image=AdaptiveResizeImage(image,geometry.width,geometry.height, exception); break; @@ -10734,13 +10692,11 @@ Mogrify(ref,...) geometry_info.sigma=argument_list[2].real_reference; if (attribute_flag[3] != 0) geometry_info.xi=argument_list[3].integer_reference;; - if (attribute_flag[4] != 0) - geometry_info.psi=argument_list[4].integer_reference;; if (attribute_flag[5] != 0) channel=(ChannelType) argument_list[5].integer_reference; channel_mask=SetPixelChannelMask(image,channel); image=SelectiveBlurImage(image,geometry_info.rho,geometry_info.sigma, - geometry_info.xi,geometry_info.psi,exception); + geometry_info.xi,exception); if (image != (Image *) NULL) (void) SetPixelChannelMask(image,channel_mask); break; diff --git a/coders/hrz.c b/coders/hrz.c index 92fa740aa..cd588cd8f 100644 --- a/coders/hrz.c +++ b/coders/hrz.c @@ -304,7 +304,7 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image, status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); - hrz_image=ResizeImage(image,256,240,image->filter,image->blur,exception); + hrz_image=ResizeImage(image,256,240,image->filter,exception); if (hrz_image == (Image *) NULL) return(MagickFalse); if (IsRGBColorspace(hrz_image->colorspace) == MagickFalse) diff --git a/coders/msl.c b/coders/msl.c index 5e8f8af30..bc8b7f05f 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -1241,8 +1241,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } channel_mask=SetPixelChannelMask(msl_info->image[n],channel); blur_image=BlurImage(msl_info->image[n],geometry_info.rho, - geometry_info.sigma,geometry_info.xi, - msl_info->exception); + geometry_info.sigma,msl_info->exception); (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask); if (blur_image == (Image *) NULL) break; @@ -1440,7 +1439,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } if (LocaleCompare((const char *) tag, "charcoal") == 0) { - double bias = 0.0, + double radius = 0.0, sigma = 1.0; @@ -1462,17 +1461,6 @@ static void MSLStartElement(void *context,const xmlChar *tag, msl_info->attributes[n],(const char *) attributes[i],&exception)); switch (*keyword) { - case 'B': - case 'b': - { - if (LocaleCompare(keyword, "bias") == 0) - { - bias=StringToDouble(value,(char **) NULL); - break; - } - ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword); - break; - } case 'R': case 'r': { @@ -1511,7 +1499,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, Image *newImage; - newImage=CharcoalImage(msl_info->image[n],radius,sigma,bias, + newImage=CharcoalImage(msl_info->image[n],radius,sigma, msl_info->exception); if (newImage == (Image *) NULL) break; @@ -5278,17 +5266,6 @@ static void MSLStartElement(void *context,const xmlChar *tag, msl_info->attributes[n],(const char *) attributes[i],&exception)); switch (*keyword) { - case 'b': - { - if (LocaleCompare(keyword,"blur") == 0) - { - msl_info->image[n]->blur=StringToDouble(value, - (char **) NULL); - break; - } - ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword); - break; - } case 'G': case 'g': { @@ -5356,8 +5333,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, (factor*(msl_info->image[n]->resolution.y == 0.0 ? DefaultResolution : msl_info->image[n]->resolution.y))+0.5); resample_image=ResizeImage(msl_info->image[n],width,height, - msl_info->image[n]->filter,msl_info->image[n]->blur, - msl_info->exception); + msl_info->image[n]->filter,msl_info->exception); if (resample_image == (Image *) NULL) break; msl_info->image[n]=DestroyImage(msl_info->image[n]); @@ -5367,9 +5343,6 @@ static void MSLStartElement(void *context,const xmlChar *tag, } if (LocaleCompare((const char *) tag,"resize") == 0) { - double - blur; - FilterTypes filter; @@ -5386,7 +5359,6 @@ static void MSLStartElement(void *context,const xmlChar *tag, break; } filter=UndefinedFilter; - blur=1.0; if (attributes != (const xmlChar **) NULL) for (i=0; (attributes[i] != (const xmlChar *) NULL); i++) { @@ -5439,18 +5411,6 @@ static void MSLStartElement(void *context,const xmlChar *tag, keyword); break; } - case 'S': - case 's': - { - if (LocaleCompare(keyword,"support") == 0) - { - blur=StringToDouble(value,(char **) NULL); - break; - } - ThrowMSLException(OptionError,"UnrecognizedAttribute", - keyword); - break; - } case 'W': case 'w': { @@ -5472,7 +5432,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } resize_image=ResizeImage(msl_info->image[n],geometry.width, - geometry.height,filter,blur,msl_info->exception); + geometry.height,filter,msl_info->exception); if (resize_image == (Image *) NULL) break; msl_info->image[n]=DestroyImage(msl_info->image[n]); @@ -6366,7 +6326,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } shadow_image=ShadowImage(msl_info->image[n],geometry_info.rho, - geometry_info.sigma,0.0,(ssize_t) ceil(geometry_info.xi-0.5), + geometry_info.sigma,(ssize_t) ceil(geometry_info.xi-0.5), (ssize_t) ceil(geometry_info.psi-0.5),msl_info->exception); if (shadow_image == (Image *) NULL) break; @@ -6376,7 +6336,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, } if (LocaleCompare((const char *) tag,"sharpen") == 0) { - double bias = 0.0, + double radius = 0.0, sigma = 1.0; @@ -6398,17 +6358,6 @@ static void MSLStartElement(void *context,const xmlChar *tag, msl_info->attributes[n],(const char *) attributes[i],&exception)); switch (*keyword) { - case 'B': - case 'b': - { - if (LocaleCompare(keyword, "bias") == 0) - { - bias = StringToDouble(value,(char **) NULL); - break; - } - ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword); - break; - } case 'R': case 'r': { @@ -6447,7 +6396,7 @@ static void MSLStartElement(void *context,const xmlChar *tag, Image *newImage; - newImage=SharpenImage(msl_info->image[n],radius,sigma,bias, + newImage=SharpenImage(msl_info->image[n],radius,sigma, msl_info->exception); if (newImage == (Image *) NULL) break; @@ -8025,13 +7974,6 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword, &image_info->background_color,exception); break; } - if (LocaleCompare(keyword,"bias") == 0) - { - if (image == (Image *) NULL) - break; - image->bias=StringToDoubleInterval(value,QuantumRange); - break; - } if (LocaleCompare(keyword,"blue-primary") == 0) { if (image == (Image *) NULL) diff --git a/coders/pcd.c b/coders/pcd.c index 5f1c2a54e..ca3e92a14 100644 --- a/coders/pcd.c +++ b/coders/pcd.c @@ -981,7 +981,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry, if ((geometry.height % 2) != 0) geometry.height--; tile_image=ResizeImage(image,geometry.width,geometry.height,TriangleFilter, - 1.0,exception); + exception); if (tile_image == (Image *) NULL) return(MagickFalse); flags=ParseGeometry(page_geometry,&geometry_info); @@ -1014,7 +1014,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry, if (IsRGBColorspace(image->colorspace) == MagickFalse) (void) TransformImageColorspace(tile_image,YCCColorspace,exception); downsample_image=ResizeImage(tile_image,tile_image->columns/2, - tile_image->rows/2,TriangleFilter,1.0,exception); + tile_image->rows/2,TriangleFilter,exception); if (downsample_image == (Image *) NULL) return(MagickFalse); /* diff --git a/coders/png.c b/coders/png.c index 66279362d..6d18ab2ea 100644 --- a/coders/png.c +++ b/coders/png.c @@ -47,6 +47,7 @@ #include "MagickCore/blob.h" #include "MagickCore/blob-private.h" #include "MagickCore/cache.h" +#include "MagickCore/channel.h" #include "MagickCore/color.h" #include "MagickCore/color-private.h" #include "MagickCore/colormap.h" diff --git a/coders/tiff.c b/coders/tiff.c index c8f5aaaa2..45b6d2635 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -2168,8 +2168,7 @@ static MagickBooleanType WritePTIFImage(const ImageInfo *image_info, rows/=2; resolution.x/=2; resolution.y/=2; - pyramid_image=ResizeImage(next,columns,rows,image->filter,image->blur, - exception); + pyramid_image=ResizeImage(next,columns,rows,image->filter,exception); if (pyramid_image == (Image *) NULL) break; pyramid_image->resolution=resolution; diff --git a/coders/xpm.c b/coders/xpm.c index b4fdbdc1f..360c7c790 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -636,7 +636,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, SetGeometry(image,&geometry); (void) ParseMetaGeometry(PiconGeometry,&geometry.x,&geometry.y, &geometry.width,&geometry.height); - picon=ResizeImage(image,geometry.width,geometry.height,TriangleFilter,1.0, + picon=ResizeImage(image,geometry.width,geometry.height,TriangleFilter, exception); blob_info=CloneImageInfo(image_info); (void) AcquireUniqueFilename(blob_info->filename); diff --git a/coders/yuv.c b/coders/yuv.c index 782fd3230..418824e08 100644 --- a/coders/yuv.c +++ b/coders/yuv.c @@ -391,7 +391,7 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) Scale image. */ resize_image=ResizeImage(chroma_image,image->columns,image->rows, - TriangleFilter,1.0,exception); + TriangleFilter,exception); chroma_image=DestroyImage(chroma_image); if (resize_image == (Image *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); @@ -641,7 +641,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, image->depth=(size_t) (quantum == 1 ? 8 : 16); width=image->columns+(image->columns & (horizontal_factor-1)); height=image->rows+(image->rows & (vertical_factor-1)); - yuv_image=ResizeImage(image,width,height,TriangleFilter,1.0,exception); + yuv_image=ResizeImage(image,width,height,TriangleFilter,exception); if (yuv_image == (Image *) NULL) { (void) CloseBlob(image); @@ -652,7 +652,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, Downsample image. */ chroma_image=ResizeImage(image,width/horizontal_factor, - height/vertical_factor,TriangleFilter,1.0,exception); + height/vertical_factor,TriangleFilter,exception); if (chroma_image == (Image *) NULL) { (void) CloseBlob(image); diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 6e01616a6..7c51a4212 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-22 + 2012-03-25 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-03-22 + 2012-03-25 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index f238adfbe..5792c70e9 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - + -- 2.40.0