% October 1996 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
#include "MagickCore/list.h"
#include "MagickCore/log.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/memory-private.h"
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
#include "MagickCore/montage.h"
#include "MagickCore/morphology.h"
+#include "MagickCore/morphology-private.h"
#include "MagickCore/paint.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
#include "MagickCore/property.h"
#include "MagickCore/quantize.h"
#include "MagickCore/quantum.h"
const double sigma,ExceptionInfo *exception)
{
#define AdaptiveBlurImageTag "Convolve/Image"
-#define MagickSigma (fabs(sigma) <= MagickEpsilon ? 1.0 : sigma)
+#define MagickSigma (fabs(sigma) < MagickEpsilon ? MagickEpsilon : sigma)
CacheView
*blur_view,
*image_view;
double
- **kernel,
normalize;
Image
MagickOffsetType
progress;
+ MagickRealType
+ **kernel;
+
register ssize_t
i;
blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (blur_image == (Image *) NULL)
return((Image *) NULL);
- if (fabs(sigma) <= MagickEpsilon)
+ if (fabs(sigma) < MagickEpsilon)
return(blur_image);
if (SetImageStorageClass(blur_image,DirectClass,exception) == MagickFalse)
{
/*
Edge detect the image brighness channel, level, blur, and level again.
*/
- edge_image=EdgeImage(image,radius,sigma,exception);
+ edge_image=EdgeImage(image,radius,exception);
if (edge_image == (Image *) NULL)
{
blur_image=DestroyImage(blur_image);
return((Image *) NULL);
}
(void) AdaptiveLevelImage(edge_image,"20%,95%",exception);
- gaussian_image=GaussianBlurImage(edge_image,radius,sigma,exception);
+ gaussian_image=BlurImage(edge_image,radius,sigma,exception);
if (gaussian_image != (Image *) NULL)
{
edge_image=DestroyImage(edge_image);
Create a set of kernels from maximum (radius,sigma) to minimum.
*/
width=GetOptimalKernelWidth2D(radius,sigma);
- kernel=(double **) AcquireAlignedMemory((size_t) width,sizeof(*kernel));
- if (kernel == (double **) NULL)
+ kernel=(MagickRealType **) MagickAssumeAligned(AcquireAlignedMemory((size_t)
+ width,sizeof(*kernel)));
+ if (kernel == (MagickRealType **) NULL)
{
edge_image=DestroyImage(edge_image);
blur_image=DestroyImage(blur_image);
(void) ResetMagickMemory(kernel,0,(size_t) width*sizeof(*kernel));
for (i=0; i < (ssize_t) width; i+=2)
{
- kernel[i]=(double *) AcquireAlignedMemory((size_t) (width-i),(width-i)*
- sizeof(**kernel));
- if (kernel[i] == (double *) NULL)
+ kernel[i]=(MagickRealType *) MagickAssumeAligned(AcquireAlignedMemory(
+ (size_t) (width-i),(width-i)*sizeof(**kernel)));
+ if (kernel[i] == (MagickRealType *) NULL)
break;
normalize=0.0;
j=(ssize_t) (width-i)/2;
{
for (u=(-j); u <= j; u++)
{
- kernel[i][k]=(double) (exp(-((double) u*u+v*v)/(2.0*MagickSigma*
+ kernel[i][k]=(MagickRealType) (exp(-((double) u*u+v*v)/(2.0*MagickSigma*
MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
normalize+=kernel[i][k];
k++;
}
}
- if (fabs(normalize) <= MagickEpsilon)
- normalize=1.0;
- normalize=1.0/normalize;
+ if (fabs(normalize) < MagickEpsilon)
+ normalize=MagickEpsilon;
+ normalize=PerceptibleReciprocal(normalize);
for (k=0; k < (j*j); k++)
kernel[i][k]=normalize*kernel[i][k];
}
if (i < (ssize_t) width)
{
for (i-=2; i >= 0; i-=2)
- kernel[i]=(double *) RelinquishAlignedMemory(kernel[i]);
- kernel=(double **) RelinquishAlignedMemory(kernel);
+ kernel[i]=(MagickRealType *) RelinquishAlignedMemory(kernel[i]);
+ kernel=(MagickRealType **) RelinquishAlignedMemory(kernel);
edge_image=DestroyImage(edge_image);
blur_image=DestroyImage(blur_image);
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ magick_threads(image,blur_image,blur_image->rows,1)
#endif
for (y=0; y < (ssize_t) blur_image->rows; y++)
{
break;
center=(ssize_t) GetPixelChannels(image)*(width-j)*((width-j)/2L)+
GetPixelChannels(image)*((width-j)/2L);
- if (GetPixelMask(image,p) != 0)
- {
- q+=GetPixelChannels(blur_image);
- r+=GetPixelChannels(edge_image);
- continue;
- }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- MagickRealType
+ double
alpha,
gamma,
pixel;
blur_traits,
traits;
- register const double
+ register const MagickRealType
*restrict k;
register const Quantum
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if ((blur_traits & CopyPixelTrait) != 0)
+ if (((blur_traits & CopyPixelTrait) != 0) ||
+ (GetPixelMask(image,p+center) == 0))
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
{
for (u=0; u < (ssize_t) (width-j); u++)
{
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,pixels));
+ alpha=(double) (QuantumScale*GetPixelAlpha(image,pixels));
pixel+=(*k)*alpha*pixels[i];
gamma+=(*k)*alpha;
k++;
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
q+=GetPixelChannels(blur_image);
image_view=DestroyCacheView(image_view);
edge_image=DestroyImage(edge_image);
for (i=0; i < (ssize_t) width; i+=2)
- kernel[i]=(double *) RelinquishAlignedMemory(kernel[i]);
- kernel=(double **) RelinquishAlignedMemory(kernel);
+ kernel[i]=(MagickRealType *) RelinquishAlignedMemory(kernel[i]);
+ kernel=(MagickRealType **) RelinquishAlignedMemory(kernel);
if (status == MagickFalse)
blur_image=DestroyImage(blur_image);
return(blur_image);
const double sigma,ExceptionInfo *exception)
{
#define AdaptiveSharpenImageTag "Convolve/Image"
-#define MagickSigma (fabs(sigma) <= MagickEpsilon ? 1.0 : sigma)
+#define MagickSigma (fabs(sigma) < MagickEpsilon ? MagickEpsilon : sigma)
CacheView
*sharp_view,
*image_view;
double
- **kernel,
normalize;
Image
MagickOffsetType
progress;
+ MagickRealType
+ **kernel;
+
register ssize_t
i;
sharp_image=CloneImage(image,0,0,MagickTrue,exception);
if (sharp_image == (Image *) NULL)
return((Image *) NULL);
- if (fabs(sigma) <= MagickEpsilon)
+ if (fabs(sigma) < MagickEpsilon)
return(sharp_image);
if (SetImageStorageClass(sharp_image,DirectClass,exception) == MagickFalse)
{
/*
Edge detect the image brighness channel, level, sharp, and level again.
*/
- edge_image=EdgeImage(image,radius,sigma,exception);
+ edge_image=EdgeImage(image,radius,exception);
if (edge_image == (Image *) NULL)
{
sharp_image=DestroyImage(sharp_image);
return((Image *) NULL);
}
(void) AdaptiveLevelImage(edge_image,"20%,95%",exception);
- gaussian_image=GaussianBlurImage(edge_image,radius,sigma,exception);
+ gaussian_image=BlurImage(edge_image,radius,sigma,exception);
if (gaussian_image != (Image *) NULL)
{
edge_image=DestroyImage(edge_image);
Create a set of kernels from maximum (radius,sigma) to minimum.
*/
width=GetOptimalKernelWidth2D(radius,sigma);
- kernel=(double **) AcquireAlignedMemory((size_t) width,sizeof(*kernel));
- if (kernel == (double **) NULL)
+ kernel=(MagickRealType **) MagickAssumeAligned(AcquireAlignedMemory((size_t)
+ width,sizeof(*kernel)));
+ if (kernel == (MagickRealType **) NULL)
{
edge_image=DestroyImage(edge_image);
sharp_image=DestroyImage(sharp_image);
(void) ResetMagickMemory(kernel,0,(size_t) width*sizeof(*kernel));
for (i=0; i < (ssize_t) width; i+=2)
{
- kernel[i]=(double *) AcquireAlignedMemory((size_t) (width-i),(width-i)*
- sizeof(**kernel));
- if (kernel[i] == (double *) NULL)
+ kernel[i]=(MagickRealType *) MagickAssumeAligned(AcquireAlignedMemory(
+ (size_t) (width-i),(width-i)*sizeof(**kernel)));
+ if (kernel[i] == (MagickRealType *) NULL)
break;
normalize=0.0;
j=(ssize_t) (width-i)/2;
{
for (u=(-j); u <= j; u++)
{
- kernel[i][k]=(double) (-exp(-((double) u*u+v*v)/(2.0*MagickSigma*
- MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
+ kernel[i][k]=(MagickRealType) (-exp(-((double) u*u+v*v)/(2.0*
+ MagickSigma*MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
normalize+=kernel[i][k];
k++;
}
}
- if (fabs(normalize) <= MagickEpsilon)
- normalize=1.0;
- normalize=1.0/normalize;
+ if (fabs(normalize) < MagickEpsilon)
+ normalize=MagickEpsilon;
+ normalize=PerceptibleReciprocal(normalize);
for (k=0; k < (j*j); k++)
kernel[i][k]=normalize*kernel[i][k];
}
if (i < (ssize_t) width)
{
for (i-=2; i >= 0; i-=2)
- kernel[i]=(double *) RelinquishAlignedMemory(kernel[i]);
- kernel=(double **) RelinquishAlignedMemory(kernel);
+ kernel[i]=(MagickRealType *) RelinquishAlignedMemory(kernel[i]);
+ kernel=(MagickRealType **) RelinquishAlignedMemory(kernel);
edge_image=DestroyImage(edge_image);
sharp_image=DestroyImage(sharp_image);
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
sharp_view=AcquireAuthenticCacheView(sharp_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ magick_threads(image,sharp_image,sharp_image->rows,1)
#endif
for (y=0; y < (ssize_t) sharp_image->rows; y++)
{
break;
center=(ssize_t) GetPixelChannels(image)*(width-j)*((width-j)/2L)+
GetPixelChannels(image)*((width-j)/2);
- if (GetPixelMask(image,p) != 0)
- {
- q+=GetPixelChannels(sharp_image);
- r+=GetPixelChannels(edge_image);
- continue;
- }
for (i=0; i < (ssize_t) GetPixelChannels(sharp_image); i++)
{
- MagickRealType
+ double
alpha,
gamma,
pixel;
sharp_traits,
traits;
- register const double
+ register const MagickRealType
*restrict k;
register const Quantum
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- sharp_traits=GetPixelChannelMapTraits(sharp_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ sharp_traits=GetPixelChannelTraits(sharp_image,channel);
if ((traits == UndefinedPixelTrait) ||
(sharp_traits == UndefinedPixelTrait))
continue;
- if ((sharp_traits & CopyPixelTrait) != 0)
+ if (((sharp_traits & CopyPixelTrait) != 0) ||
+ (GetPixelMask(image,p+center) == 0))
{
SetPixelChannel(sharp_image,channel,p[center+i],q);
continue;
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(sharp_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
{
for (u=0; u < (ssize_t) (width-j); u++)
{
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,pixels));
+ alpha=(double) (QuantumScale*GetPixelAlpha(image,pixels));
pixel+=(*k)*alpha*pixels[i];
gamma+=(*k)*alpha;
k++;
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(sharp_image,channel,ClampToQuantum(gamma*pixel),q);
}
q+=GetPixelChannels(sharp_image);
image_view=DestroyCacheView(image_view);
edge_image=DestroyImage(edge_image);
for (i=0; i < (ssize_t) width; i+=2)
- kernel[i]=(double *) RelinquishAlignedMemory(kernel[i]);
- kernel=(double **) RelinquishAlignedMemory(kernel);
+ kernel[i]=(MagickRealType *) RelinquishAlignedMemory(kernel[i]);
+ kernel=(MagickRealType **) RelinquishAlignedMemory(kernel);
if (status == MagickFalse)
sharp_image=DestroyImage(sharp_image);
return(sharp_image);
% the radius should be larger than sigma. Use a radius of 0 and BlurImage()
% selects a suitable radius for you.
%
-% BlurImage() differs from GaussianBlurImage() in that it uses a separable
-% kernel which is faster but mathematically equivalent to the non-separable
-% kernel.
-%
% The format of the BlurImage method is:
%
% Image *BlurImage(const Image *image,const double radius,
% o exception: return any errors or warnings in this structure.
%
*/
-
-static double *GetBlurKernel(const size_t width,const double sigma)
-{
- double
- *kernel,
- normalize;
-
- register ssize_t
- i;
-
- ssize_t
- j,
- k;
-
- /*
- Generate a 1-D convolution kernel.
- */
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- kernel=(double *) AcquireAlignedMemory((size_t) width,sizeof(*kernel));
- if (kernel == (double *) NULL)
- return(0);
- normalize=0.0;
- j=(ssize_t) width/2;
- i=0;
- for (k=(-j); k <= j; k++)
- {
- kernel[i]=(double) (exp(-((double) k*k)/(2.0*MagickSigma*MagickSigma))/
- (MagickSQ2PI*MagickSigma));
- normalize+=kernel[i];
- i++;
- }
- for (i=0; i < (ssize_t) width; i++)
- kernel[i]/=normalize;
- return(kernel);
-}
-
MagickExport Image *BlurImage(const Image *image,const double radius,
const double sigma,ExceptionInfo *exception)
{
-#define BlurImageTag "Blur/Image"
-
- CacheView
- *blur_view,
- *image_view;
+ char
+ geometry[MaxTextExtent];
- double
- *kernel;
+ KernelInfo
+ *kernel_info;
Image
*blur_image;
- MagickBooleanType
- status;
-
- MagickOffsetType
- progress;
-
- register ssize_t
- i;
-
- size_t
- width;
-
- ssize_t
- center,
- x,
- y;
-
- /*
- Initialize blur image attributes.
- */
- assert(image != (Image *) NULL);
+ assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- blur_image=CloneImage(image,0,0,MagickTrue,exception);
- if (blur_image == (Image *) NULL)
- return((Image *) NULL);
- if (fabs(sigma) <= MagickEpsilon)
- return(blur_image);
- if (SetImageStorageClass(blur_image,DirectClass,exception) == MagickFalse)
- {
- blur_image=DestroyImage(blur_image);
- return((Image *) NULL);
- }
- width=GetOptimalKernelWidth1D(radius,sigma);
- kernel=GetBlurKernel(width,sigma);
- if (kernel == (double *) NULL)
- {
- blur_image=DestroyImage(blur_image);
- ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
- }
- if (image->debug != MagickFalse)
- {
- char
- format[MaxTextExtent],
- *message;
-
- register const double
- *k;
-
- (void) LogMagickEvent(TransformEvent,GetMagickModule(),
- " blur image with kernel width %.20g:",(double) width);
- message=AcquireString("");
- k=kernel;
- for (i=0; i < (ssize_t) width; i++)
- {
- *message='\0';
- (void) FormatLocaleString(format,MaxTextExtent,"%.20g: ",(double) i);
- (void) ConcatenateString(&message,format);
- (void) FormatLocaleString(format,MaxTextExtent,"%g ",*k++);
- (void) ConcatenateString(&message,format);
- (void) LogMagickEvent(TransformEvent,GetMagickModule(),"%s",message);
- }
- message=DestroyString(message);
- }
- /*
- Blur rows.
- */
- status=MagickTrue;
- progress=0;
- center=(ssize_t) GetPixelChannels(image)*(width/2L);
- image_view=AcquireVirtualCacheView(image,exception);
- blur_view=AcquireAuthenticCacheView(blur_image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register const Quantum
- *restrict p;
-
- register Quantum
- *restrict q;
-
- register ssize_t
- x;
-
- if (status == MagickFalse)
- continue;
- p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y,
- image->columns+width,1,exception);
- q=QueueCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
- exception);
- if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
- {
- status=MagickFalse;
- continue;
- }
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- register ssize_t
- i;
-
- if (GetPixelMask(image,p) != 0)
- {
- p+=GetPixelChannels(image);
- q+=GetPixelChannels(blur_image);
- continue;
- }
- for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
- {
- MagickRealType
- alpha,
- gamma,
- pixel;
-
- PixelChannel
- channel;
-
- PixelTrait
- blur_traits,
- traits;
-
- register const double
- *restrict k;
-
- register const Quantum
- *restrict pixels;
-
- register ssize_t
- u;
-
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
- if ((traits == UndefinedPixelTrait) ||
- (blur_traits == UndefinedPixelTrait))
- continue;
- if ((blur_traits & CopyPixelTrait) != 0)
- {
- SetPixelChannel(blur_image,channel,p[center+i],q);
- continue;
- }
- k=kernel;
- pixels=p;
- pixel=0.0;
- if ((blur_traits & BlendPixelTrait) == 0)
- {
- /*
- No alpha blending.
- */
- for (u=0; u < (ssize_t) width; u++)
- {
- pixel+=(*k)*pixels[i];
- k++;
- pixels+=GetPixelChannels(image);
- }
- SetPixelChannel(blur_image,channel,ClampToQuantum(pixel),q);
- continue;
- }
- /*
- Alpha blending.
- */
- gamma=0.0;
- for (u=0; u < (ssize_t) width; u++)
- {
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,pixels));
- pixel+=(*k)*alpha*pixels[i];
- gamma+=(*k)*alpha;
- k++;
- pixels+=GetPixelChannels(image);
- }
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
- }
- p+=GetPixelChannels(image);
- q+=GetPixelChannels(blur_image);
- }
- if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
- status=MagickFalse;
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_BlurImage)
-#endif
- proceed=SetImageProgress(image,BlurImageTag,progress++,blur_image->rows+
- blur_image->columns);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- blur_view=DestroyCacheView(blur_view);
- image_view=DestroyCacheView(image_view);
- /*
- Blur columns.
- */
- center=(ssize_t) GetPixelChannels(blur_image)*(width/2L);
- image_view=AcquireVirtualCacheView(blur_image,exception);
- blur_view=AcquireAuthenticCacheView(blur_image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
-#endif
- for (x=0; x < (ssize_t) blur_image->columns; x++)
- {
- register const Quantum
- *restrict p;
-
- register Quantum
- *restrict q;
-
- register ssize_t
- y;
-
- if (status == MagickFalse)
- continue;
- p=GetCacheViewVirtualPixels(image_view,x,-((ssize_t) width/2L),1,
- blur_image->rows+width,exception);
- q=GetCacheViewAuthenticPixels(blur_view,x,0,1,blur_image->rows,exception);
- if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
- {
- status=MagickFalse;
- continue;
- }
- for (y=0; y < (ssize_t) blur_image->rows; y++)
- {
- register ssize_t
- i;
-
- if (GetPixelMask(image,p) != 0)
- {
- p+=GetPixelChannels(blur_image);
- q+=GetPixelChannels(blur_image);
- continue;
- }
- for (i=0; i < (ssize_t) GetPixelChannels(blur_image); i++)
- {
- MagickRealType
- alpha,
- gamma,
- pixel;
-
- PixelChannel
- channel;
-
- PixelTrait
- blur_traits,
- traits;
-
- register const double
- *restrict k;
-
- register const Quantum
- *restrict pixels;
-
- register ssize_t
- u;
-
- channel=GetPixelChannelMapChannel(blur_image,i);
- traits=GetPixelChannelMapTraits(blur_image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
- if ((traits == UndefinedPixelTrait) ||
- (blur_traits == UndefinedPixelTrait))
- continue;
- if ((blur_traits & CopyPixelTrait) != 0)
- {
- SetPixelChannel(blur_image,channel,p[center+i],q);
- continue;
- }
- k=kernel;
- pixels=p;
- pixel=0.0;
- if ((blur_traits & BlendPixelTrait) == 0)
- {
- /*
- No alpha blending.
- */
- for (u=0; u < (ssize_t) width; u++)
- {
- pixel+=(*k)*pixels[i];
- k++;
- pixels+=GetPixelChannels(blur_image);
- }
- SetPixelChannel(blur_image,channel,ClampToQuantum(pixel),q);
- continue;
- }
- /*
- Alpha blending.
- */
- gamma=0.0;
- for (u=0; u < (ssize_t) width; u++)
- {
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(blur_image,
- pixels));
- pixel+=(*k)*alpha*pixels[i];
- gamma+=(*k)*alpha;
- k++;
- pixels+=GetPixelChannels(blur_image);
- }
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
- }
- p+=GetPixelChannels(blur_image);
- q+=GetPixelChannels(blur_image);
- }
- if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
- status=MagickFalse;
- if (blur_image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_BlurImage)
-#endif
- proceed=SetImageProgress(blur_image,BlurImageTag,progress++,
- blur_image->rows+blur_image->columns);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- blur_view=DestroyCacheView(blur_view);
- image_view=DestroyCacheView(image_view);
- kernel=(double *) RelinquishAlignedMemory(kernel);
- blur_image->type=image->type;
- if (status == MagickFalse)
- blur_image=DestroyImage(blur_image);
+ (void) FormatLocaleString(geometry,MaxTextExtent,
+ "blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
+ kernel_info=AcquireKernelInfo(geometry);
+ if (kernel_info == (KernelInfo *) NULL)
+ ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
+ blur_image=MorphologyApply(image,ConvolveMorphology,1,kernel_info,
+ UndefinedCompositeOp,0.0,exception);
+ kernel_info=DestroyKernelInfo(kernel_info);
return(blur_image);
}
\f
MagickExport Image *ConvolveImage(const Image *image,
const KernelInfo *kernel_info,ExceptionInfo *exception)
{
- return(MorphologyImage(image,CorrelateMorphology,1,kernel_info,exception));
+ Image
+ *convolve_image;
+
+ convolve_image=MorphologyApply(image,ConvolveMorphology,1,kernel_info,
+ UndefinedCompositeOp,0.0,exception);
+ return(convolve_image);
}
\f
/*
%
*/
-static void Hull(const ssize_t x_offset,const ssize_t y_offset,
- const size_t columns,const size_t rows,const int polarity,Quantum *restrict f,
- Quantum *restrict g)
+static void Hull(const Image *image,const ssize_t x_offset,
+ const ssize_t y_offset,const size_t columns,const size_t rows,
+ const int polarity,Quantum *restrict f,Quantum *restrict g)
{
register Quantum
*p,
q=g+(columns+2);
r=p+(y_offset*(columns+2)+x_offset);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_num_threads_dos(columns,rows)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (y=0; y < (ssize_t) rows; y++)
{
+ MagickRealType
+ v;
+
register ssize_t
i,
x;
- SignedQuantum
- v;
-
i=(2*y+1)+y*columns;
if (polarity > 0)
for (x=0; x < (ssize_t) columns; x++)
{
- v=(SignedQuantum) p[i];
- if ((SignedQuantum) r[i] >= (v+ScaleCharToQuantum(2)))
+ v=(MagickRealType) p[i];
+ if ((MagickRealType) r[i] >= (v+ScaleCharToQuantum(2)))
v+=ScaleCharToQuantum(1);
q[i]=(Quantum) v;
i++;
else
for (x=0; x < (ssize_t) columns; x++)
{
- v=(SignedQuantum) p[i];
- if ((SignedQuantum) r[i] <= (v-ScaleCharToQuantum(2)))
+ v=(MagickRealType) p[i];
+ if ((MagickRealType) r[i] <= (v-ScaleCharToQuantum(2)))
v-=ScaleCharToQuantum(1);
q[i]=(Quantum) v;
i++;
r=q+(y_offset*(columns+2)+x_offset);
s=q-(y_offset*(columns+2)+x_offset);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static) \
- dynamic_num_threads_dos(columns,rows)
+ #pragma omp parallel for schedule(static,4) \
+ magick_threads(image,image,1,1)
#endif
for (y=0; y < (ssize_t) rows; y++)
{
i,
x;
- SignedQuantum
+ MagickRealType
v;
i=(2*y+1)+y*columns;
if (polarity > 0)
for (x=0; x < (ssize_t) columns; x++)
{
- v=(SignedQuantum) q[i];
- if (((SignedQuantum) s[i] >= (v+ScaleCharToQuantum(2))) &&
- ((SignedQuantum) r[i] > v))
+ v=(MagickRealType) q[i];
+ if (((MagickRealType) s[i] >= (v+ScaleCharToQuantum(2))) &&
+ ((MagickRealType) r[i] > v))
v+=ScaleCharToQuantum(1);
p[i]=(Quantum) v;
i++;
else
for (x=0; x < (ssize_t) columns; x++)
{
- v=(SignedQuantum) q[i];
- if (((SignedQuantum) s[i] <= (v-ScaleCharToQuantum(2))) &&
- ((SignedQuantum) r[i] < v))
+ v=(MagickRealType) q[i];
+ if (((MagickRealType) s[i] <= (v-ScaleCharToQuantum(2))) &&
+ ((MagickRealType) r[i] < v))
v-=ScaleCharToQuantum(1);
p[i]=(Quantum) v;
i++;
if (status == MagickFalse)
continue;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- despeckle_traits=GetPixelChannelMapTraits(despeckle_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ despeckle_traits=GetPixelChannelTraits(despeckle_image,channel);
if ((traits == UndefinedPixelTrait) ||
(despeckle_traits == UndefinedPixelTrait))
continue;
(void) ResetMagickMemory(buffer,0,length*sizeof(*buffer));
for (k=0; k < 4; k++)
{
- Hull(X[k],Y[k],image->columns,image->rows,1,pixels,buffer);
- Hull(-X[k],-Y[k],image->columns,image->rows,1,pixels,buffer);
- Hull(-X[k],-Y[k],image->columns,image->rows,-1,pixels,buffer);
- Hull(X[k],Y[k],image->columns,image->rows,-1,pixels,buffer);
+ Hull(image,X[k],Y[k],image->columns,image->rows,1,pixels,buffer);
+ Hull(image,-X[k],-Y[k],image->columns,image->rows,1,pixels,buffer);
+ Hull(image,-X[k],-Y[k],image->columns,image->rows,-1,pixels,buffer);
+ Hull(image,X[k],Y[k],image->columns,image->rows,-1,pixels,buffer);
}
j=(ssize_t) image->columns+2;
for (y=0; y < (ssize_t) image->rows; y++)
register Quantum
*restrict q;
- q=QueueCacheViewAuthenticPixels(despeckle_view,0,y,
- despeckle_image->columns,1,exception);
+ q=GetCacheViewAuthenticPixels(despeckle_view,0,y,despeckle_image->columns,
+ 1,exception);
if (q == (Quantum *) NULL)
{
status=MagickFalse;
% The format of the EdgeImage method is:
%
% Image *EdgeImage(const Image *image,const double radius,
-% const double sigma,ExceptionInfo *exception)
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o radius: the radius of the pixel neighborhood.
%
-% o sigma: the standard deviation of the Gaussian, in pixels.
-%
% o exception: return any errors or warnings in this structure.
%
*/
MagickExport Image *EdgeImage(const Image *image,const double radius,
- const double sigma,ExceptionInfo *exception)
+ ExceptionInfo *exception)
{
- Image
- *edge_image;
+ char
+ geometry[MaxTextExtent];
KernelInfo
*kernel_info;
- register ssize_t
- i;
-
- size_t
- width;
-
- ssize_t
- j,
- u,
- v;
+ Image
+ *edge_image;
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- width=GetOptimalKernelWidth1D(radius,sigma);
- kernel_info=AcquireKernelInfo((const char *) NULL);
+ (void) FormatLocaleString(geometry,MaxTextExtent,"laplacian:%.20g",radius);
+ kernel_info=AcquireKernelInfo(geometry);
if (kernel_info == (KernelInfo *) NULL)
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
- kernel_info->width=width;
- kernel_info->height=width;
- kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width,
- kernel_info->width*sizeof(*kernel_info->values));
- if (kernel_info->values == (double *) NULL)
- {
- kernel_info=DestroyKernelInfo(kernel_info);
- ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
- }
- j=(ssize_t) kernel_info->width/2;
- i=0;
- for (v=(-j); v <= j; v++)
- {
- for (u=(-j); u <= j; u++)
- {
- kernel_info->values[i]=(-1.0);
- i++;
- }
- }
- kernel_info->values[i/2]=(double) (width*width-1.0);
- edge_image=ConvolveImage(image,kernel_info,exception);
+ edge_image=MorphologyApply(image,ConvolveMorphology,1,kernel_info,
+ UndefinedCompositeOp,0.0,exception);
kernel_info=DestroyKernelInfo(kernel_info);
return(edge_image);
}
MagickExport Image *EmbossImage(const Image *image,const double radius,
const double sigma,ExceptionInfo *exception)
{
+ double
+ gamma,
+ normalize;
+
Image
*emboss_image;
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
kernel_info->width=width;
kernel_info->height=width;
- kernel_info->values=(double *) AcquireAlignedMemory(kernel_info->width,
- kernel_info->width*sizeof(*kernel_info->values));
- if (kernel_info->values == (double *) NULL)
+ kernel_info->x=(ssize_t) (width-1)/2;
+ kernel_info->y=(ssize_t) (width-1)/2;
+ kernel_info->values=(MagickRealType *) MagickAssumeAligned(
+ AcquireAlignedMemory(kernel_info->width,kernel_info->width*
+ sizeof(*kernel_info->values)));
+ if (kernel_info->values == (MagickRealType *) NULL)
{
kernel_info=DestroyKernelInfo(kernel_info);
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
}
- j=(ssize_t) kernel_info->width/2;
+ j=(ssize_t) (kernel_info->width-1)/2;
k=j;
i=0;
for (v=(-j); v <= j; v++)
{
for (u=(-j); u <= j; u++)
{
- kernel_info->values[i]=(double) (((u < 0) || (v < 0) ? -8.0 : 8.0)*
- exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
+ kernel_info->values[i]=(MagickRealType) (((u < 0) || (v < 0) ? -8.0 :
+ 8.0)*exp(-((double) u*u+v*v)/(2.0*MagickSigma*MagickSigma))/
(2.0*MagickPI*MagickSigma*MagickSigma));
- if (u != k)
- kernel_info->values[i]=0.0;
+ if (u == k)
+ kernel_info->values[i]=v == k ? 1.0 : 0.0;
i++;
}
k--;
}
- emboss_image=ConvolveImage(image,kernel_info,exception);
+ normalize=0.0;
+ for (i=0; i < (ssize_t) (kernel_info->width*kernel_info->height); i++)
+ normalize+=kernel_info->values[i];
+ gamma=PerceptibleReciprocal(normalize);
+ for (i=0; i < (ssize_t) (kernel_info->width*kernel_info->height); i++)
+ kernel_info->values[i]*=gamma;
+ emboss_image=MorphologyApply(image,ConvolveMorphology,1,kernel_info,
+ UndefinedCompositeOp,0.0,exception);
kernel_info=DestroyKernelInfo(kernel_info);
if (emboss_image != (Image *) NULL)
(void) EqualizeImage(emboss_image,exception);
MagickExport Image *GaussianBlurImage(const Image *image,const double radius,
const double sigma,ExceptionInfo *exception)
{
- Image
- *blur_image;
+ char
+ geometry[MaxTextExtent];
KernelInfo
*kernel_info;
- register ssize_t
- i;
-
- size_t
- width;
-
- ssize_t
- j,
- u,
- v;
+ Image
+ *blur_image;
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- width=GetOptimalKernelWidth2D(radius,sigma);
- kernel_info=AcquireKernelInfo((const char *) NULL);
+ (void) FormatLocaleString(geometry,MaxTextExtent,"gaussian:%.20gx%.20g",
+ radius,sigma);
+ kernel_info=AcquireKernelInfo(geometry);
if (kernel_info == (KernelInfo *) NULL)
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
- (void) ResetMagickMemory(kernel_info,0,sizeof(*kernel_info));
- kernel_info->width=width;
- kernel_info->height=width;
- kernel_info->signature=MagickSignature;
- kernel_info->values=(double *) AcquireAlignedMemory(
- kernel_info->width,kernel_info->width*sizeof(*kernel_info->values));
- if (kernel_info->values == (double *) NULL)
- {
- kernel_info=DestroyKernelInfo(kernel_info);
- ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
- }
- j=(ssize_t) kernel_info->width/2;
- i=0;
- for (v=(-j); v <= j; v++)
- {
- for (u=(-j); u <= j; u++)
- {
- kernel_info->values[i]=(double) (exp(-((double) u*u+v*v)/(2.0*
- MagickSigma*MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
- i++;
- }
- }
- blur_image=ConvolveImage(image,kernel_info,exception);
+ blur_image=MorphologyApply(image,ConvolveMorphology,1,kernel_info,
+ UndefinedCompositeOp,0.0,exception);
kernel_info=DestroyKernelInfo(kernel_info);
return(blur_image);
}
%
*/
-static double *GetMotionBlurKernel(const size_t width,const double sigma)
+static MagickRealType *GetMotionBlurKernel(const size_t width,
+ const double sigma)
{
- double
+ MagickRealType
*kernel,
normalize;
Generate a 1-D convolution kernel.
*/
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- kernel=(double *) AcquireAlignedMemory((size_t) width,sizeof(*kernel));
- if (kernel == (double *) NULL)
+ kernel=(MagickRealType *) MagickAssumeAligned(AcquireAlignedMemory((size_t)
+ width,sizeof(*kernel)));
+ if (kernel == (MagickRealType *) NULL)
return(kernel);
normalize=0.0;
for (i=0; i < (ssize_t) width; i++)
{
- kernel[i]=(double) (exp((-((double) i*i)/(double) (2.0*MagickSigma*
+ kernel[i]=(MagickRealType) (exp((-((double) i*i)/(double) (2.0*MagickSigma*
MagickSigma)))/(MagickSQ2PI*MagickSigma));
normalize+=kernel[i];
}
MagickExport Image *MotionBlurImage(const Image *image,const double radius,
const double sigma,const double angle,ExceptionInfo *exception)
{
+#define BlurImageTag "Blur/Image"
+
CacheView
*blur_view,
*image_view,
*motion_view;
- double
- *kernel;
-
Image
*blur_image;
MagickOffsetType
progress;
+ MagickRealType
+ *kernel;
+
OffsetInfo
*offset;
assert(exception != (ExceptionInfo *) NULL);
width=GetOptimalKernelWidth1D(radius,sigma);
kernel=GetMotionBlurKernel(width,sigma);
- if (kernel == (double *) NULL)
+ if (kernel == (MagickRealType *) NULL)
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
offset=(OffsetInfo *) AcquireQuantumMemory(width,sizeof(*offset));
if (offset == (OffsetInfo *) NULL)
{
- kernel=(double *) RelinquishAlignedMemory(kernel);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
}
blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (blur_image == (Image *) NULL)
{
- kernel=(double *) RelinquishAlignedMemory(kernel);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
offset=(OffsetInfo *) RelinquishMagickMemory(offset);
return((Image *) NULL);
}
if (SetImageStorageClass(blur_image,DirectClass,exception) == MagickFalse)
{
- kernel=(double *) RelinquishAlignedMemory(kernel);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
offset=(OffsetInfo *) RelinquishMagickMemory(offset);
blur_image=DestroyImage(blur_image);
return((Image *) NULL);
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ magick_threads(image,blur_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
register ssize_t
i;
- if (GetPixelMask(image,p) != 0)
- {
- p+=GetPixelChannels(image);
- q+=GetPixelChannels(blur_image);
- continue;
- }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- MagickRealType
+ double
alpha,
gamma,
pixel;
register const Quantum
*restrict r;
- register double
+ register MagickRealType
*restrict k;
register ssize_t
j;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if ((blur_traits & CopyPixelTrait) != 0)
+ if (((blur_traits & CopyPixelTrait) != 0) ||
+ (GetPixelMask(image,p) == 0))
{
SetPixelChannel(blur_image,channel,p[i],q);
continue;
status=MagickFalse;
continue;
}
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,r));
+ alpha=(double) (QuantumScale*GetPixelAlpha(image,r));
pixel+=(*k)*alpha*r[i];
gamma+=(*k)*alpha;
k++;
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(image);
blur_view=DestroyCacheView(blur_view);
motion_view=DestroyCacheView(motion_view);
image_view=DestroyCacheView(image_view);
- kernel=(double *) RelinquishAlignedMemory(kernel);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
offset=(OffsetInfo *) RelinquishMagickMemory(offset);
if (status == MagickFalse)
blur_image=DestroyImage(blur_image);
sigma,
threshold;
+ extern const char
+ DefaultTileFrame[];
+
Image
*images,
*montage_image,
{
degrees+=5.0;
preview_image=ShearImage(thumbnail,degrees,degrees,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"shear %gx%g",
- degrees,2.0*degrees);
+ (void) FormatLocaleString(label,MaxTextExtent,"shear %gx%g",degrees,
+ 2.0*degrees);
break;
}
case RollPreview:
preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
if (preview_image == (Image *) NULL)
break;
- (void) FormatLocaleString(factor,MaxTextExtent,"100,100,%g",
- 2.0*percentage);
+ (void) FormatLocaleString(factor,MaxTextExtent,"100,100,%g",2.0*
+ percentage);
(void) ModulateImage(preview_image,factor,exception);
(void) FormatLocaleString(label,MaxTextExtent,"modulate %s",factor);
break;
preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
if (preview_image == (Image *) NULL)
break;
- (void) FormatLocaleString(factor,MaxTextExtent,"100,%g",
- 2.0*percentage);
+ (void) FormatLocaleString(factor,MaxTextExtent,"100,%g",2.0*percentage);
(void) ModulateImage(preview_image,factor,exception);
(void) FormatLocaleString(label,MaxTextExtent,"modulate %s",factor);
break;
case SharpenPreview:
{
preview_image=SharpenImage(thumbnail,radius,sigma,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"sharpen %gx%g",
- radius,sigma);
+ (void) FormatLocaleString(label,MaxTextExtent,"sharpen %gx%g",radius,
+ sigma);
break;
}
case BlurPreview:
preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
if (preview_image == (Image *) NULL)
break;
- (void) BilevelImage(thumbnail,(double) (percentage*((MagickRealType)
+ (void) BilevelImage(thumbnail,(double) (percentage*((double)
QuantumRange+1.0))/100.0,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"threshold %g",
- (double) (percentage*((MagickRealType) QuantumRange+1.0))/100.0);
+ (void) FormatLocaleString(label,MaxTextExtent,"threshold %g",(double)
+ (percentage*((double) QuantumRange+1.0))/100.0);
break;
}
case EdgeDetectPreview:
{
- preview_image=EdgeImage(thumbnail,radius,sigma,exception);
+ preview_image=EdgeImage(thumbnail,radius,exception);
(void) FormatLocaleString(label,MaxTextExtent,"edge %g",radius);
break;
}
{
preview_image=SpreadImage(thumbnail,radius,thumbnail->interpolate,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"spread %g",
- radius+0.5);
+ (void) FormatLocaleString(label,MaxTextExtent,"spread %g",radius+0.5);
break;
}
case SolarizePreview:
preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
if (preview_image == (Image *) NULL)
break;
- (void) SolarizeImage(preview_image,(double) QuantumRange*
- percentage/100.0,exception);
+ (void) SolarizeImage(preview_image,(double) QuantumRange*percentage/
+ 100.0,exception);
(void) FormatLocaleString(label,MaxTextExtent,"solarize %g",
(QuantumRange*percentage)/100.0);
break;
degrees+=10.0;
preview_image=ShadeImage(thumbnail,MagickTrue,degrees,degrees,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"shade %gx%g",
- degrees,degrees);
+ (void) FormatLocaleString(label,MaxTextExtent,"shade %gx%g",degrees,
+ degrees);
break;
}
case RaisePreview:
break;
geometry.width=(size_t) (2*i+2);
geometry.height=(size_t) (2*i+2);
- geometry.x=i/2;
- geometry.y=i/2;
+ geometry.x=(i-1)/2;
+ geometry.y=(i-1)/2;
(void) RaiseImage(preview_image,&geometry,MagickTrue,exception);
(void) FormatLocaleString(label,MaxTextExtent,
"raise %.20gx%.20g%+.20g%+.20g",(double) geometry.width,(double)
degrees+=5.0f;
preview_image=WaveImage(thumbnail,0.5*degrees,2.0*degrees,
image->interpolate,exception);
- (void) FormatLocaleString(label,MaxTextExtent,"wave %gx%g",
- 0.5*degrees,2.0*degrees);
+ (void) FormatLocaleString(label,MaxTextExtent,"wave %gx%g",0.5*degrees,
+ 2.0*degrees);
break;
}
case OilPaintPreview:
{
preview_image=OilPaintImage(thumbnail,(double) radius,(double) sigma,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",
- radius,sigma);
+ (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",radius,
+ sigma);
break;
}
case CharcoalDrawingPreview:
{
preview_image=CharcoalImage(thumbnail,(double) radius,(double) sigma,
exception);
- (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",
- radius,sigma);
+ (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",radius,
+ sigma);
break;
}
case JPEGPreview:
MagickOffsetType
progress;
- MagickRealType
+ double
blur_radius,
*cos_theta,
offset,
blur_image=DestroyImage(blur_image);
return((Image *) NULL);
}
- blur_center.x=(double) image->columns/2.0;
- blur_center.y=(double) image->rows/2.0;
+ blur_center.x=(double) (image->columns-1)/2.0;
+ blur_center.y=(double) (image->rows-1)/2.0;
blur_radius=hypot(blur_center.x,blur_center.y);
n=(size_t) fabs(4.0*DegreesToRadians(angle)*sqrt((double) blur_radius)+2UL);
- theta=DegreesToRadians(angle)/(MagickRealType) (n-1);
- cos_theta=(MagickRealType *) AcquireQuantumMemory((size_t) n,
+ theta=DegreesToRadians(angle)/(double) (n-1);
+ cos_theta=(double *) AcquireQuantumMemory((size_t) n,
sizeof(*cos_theta));
- sin_theta=(MagickRealType *) AcquireQuantumMemory((size_t) n,
+ sin_theta=(double *) AcquireQuantumMemory((size_t) n,
sizeof(*sin_theta));
- if ((cos_theta == (MagickRealType *) NULL) ||
- (sin_theta == (MagickRealType *) NULL))
+ if ((cos_theta == (double *) NULL) ||
+ (sin_theta == (double *) NULL))
{
blur_image=DestroyImage(blur_image);
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
}
- offset=theta*(MagickRealType) (n-1)/2.0;
+ offset=theta*(double) (n-1)/2.0;
for (i=0; i < (ssize_t) n; i++)
{
cos_theta[i]=cos((double) (theta*i-offset));
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ magick_threads(image,blur_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickRealType
+ double
radius;
PointInfo
if (step >= n)
step=n-1;
}
- if (GetPixelMask(image,p) != 0)
- {
- p+=GetPixelChannels(image);
- q+=GetPixelChannels(blur_image);
- continue;
- }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- MagickRealType
+ double
gamma,
pixel;
register ssize_t
j;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if ((blur_traits & CopyPixelTrait) != 0)
+ if (((blur_traits & CopyPixelTrait) != 0) ||
+ (GetPixelMask(image,p) == 0))
{
SetPixelChannel(blur_image,channel,p[i],q);
continue;
pixel+=r[i];
gamma++;
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
pixel+=GetPixelAlpha(image,r)*r[i];
gamma+=GetPixelAlpha(image,r);
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(image);
blur_view=DestroyCacheView(blur_view);
radial_view=DestroyCacheView(radial_view);
image_view=DestroyCacheView(image_view);
- cos_theta=(MagickRealType *) RelinquishMagickMemory(cos_theta);
- sin_theta=(MagickRealType *) RelinquishMagickMemory(sin_theta);
+ cos_theta=(double *) RelinquishMagickMemory(cos_theta);
+ sin_theta=(double *) RelinquishMagickMemory(sin_theta);
if (status == MagickFalse)
blur_image=DestroyImage(blur_image);
return(blur_image);
CacheView
*blur_view,
- *image_view;
-
- double
- *kernel;
+ *image_view,
+ *luminance_view;
Image
- *blur_image;
+ *blur_image,
+ *luminance_image;
MagickBooleanType
status;
MagickOffsetType
progress;
+ MagickRealType
+ *kernel;
+
register ssize_t
i;
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
width=GetOptimalKernelWidth1D(radius,sigma);
- kernel=(double *) AcquireAlignedMemory((size_t) width,width*sizeof(*kernel));
- if (kernel == (double *) NULL)
+ kernel=(MagickRealType *) MagickAssumeAligned(AcquireAlignedMemory((size_t)
+ width,width*sizeof(*kernel)));
+ if (kernel == (MagickRealType *) NULL)
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
- j=(ssize_t) width/2;
+ j=(ssize_t) (width-1)/2;
i=0;
for (v=(-j); v <= j; v++)
{
for (u=(-j); u <= j; u++)
- kernel[i++]=(double) (exp(-((double) u*u+v*v)/(2.0*MagickSigma*
+ kernel[i++]=(MagickRealType) (exp(-((double) u*u+v*v)/(2.0*MagickSigma*
MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
}
if (image->debug != MagickFalse)
format[MaxTextExtent],
*message;
- register const double
+ register const MagickRealType
*k;
ssize_t
(void) ConcatenateString(&message,format);
for (u=0; u < (ssize_t) width; u++)
{
- (void) FormatLocaleString(format,MaxTextExtent,"%+f ",*k++);
+ (void) FormatLocaleString(format,MaxTextExtent,"%+f ",(double) *k++);
(void) ConcatenateString(&message,format);
}
(void) LogMagickEvent(TransformEvent,GetMagickModule(),"%s",message);
if (SetImageStorageClass(blur_image,DirectClass,exception) == MagickFalse)
{
blur_image=DestroyImage(blur_image);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
+ return((Image *) NULL);
+ }
+ luminance_image=CloneImage(image,0,0,MagickTrue,exception);
+ if (luminance_image == (Image *) NULL)
+ {
+ blur_image=DestroyImage(blur_image);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
+ return((Image *) NULL);
+ }
+ status=TransformImageColorspace(luminance_image,GRAYColorspace,exception);
+ if (status == MagickFalse)
+ {
+ luminance_image=DestroyImage(luminance_image);
+ blur_image=DestroyImage(blur_image);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
return((Image *) NULL);
}
/*
*/
status=MagickTrue;
progress=0;
- center=(ssize_t) (GetPixelChannels(image)*(image->columns+width)*(width/2L)+
- GetPixelChannels(image)*(width/2L));
+ center=(ssize_t) (GetPixelChannels(image)*(image->columns+width)*
+ ((width-1)/2L)+GetPixelChannels(image)*((width-1)/2L));
image_view=AcquireVirtualCacheView(image,exception);
+ luminance_view=AcquireVirtualCacheView(luminance_image,exception);
blur_view=AcquireAuthenticCacheView(blur_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ magick_threads(image,blur_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
sync;
register const Quantum
+ *restrict l,
*restrict p;
register Quantum
if (status == MagickFalse)
continue;
- p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t)
- (width/2L),image->columns+width,width,exception);
+ p=GetCacheViewVirtualPixels(image_view,-((ssize_t) (width-1)/2L),y-(ssize_t)
+ ((width-1)/2L),image->columns+width,width,exception);
+ l=GetCacheViewVirtualPixels(luminance_view,-((ssize_t) (width-1)/2L),y-
+ (ssize_t) ((width-1)/2L),luminance_image->columns+width,width,exception);
q=QueueCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
}
for (x=0; x < (ssize_t) image->columns; x++)
{
+ double
+ intensity;
+
register ssize_t
i;
- if (GetPixelMask(image,p) != 0)
- {
- p+=GetPixelChannels(image);
- q+=GetPixelChannels(blur_image);
- continue;
- }
+ intensity=GetPixelIntensity(image,p+center);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- MagickRealType
+ double
alpha,
gamma,
- intensity,
pixel;
PixelChannel
blur_traits,
traits;
- register const double
+ register const MagickRealType
*restrict k;
register const Quantum
+ *restrict luminance_pixels,
*restrict pixels;
register ssize_t
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if ((blur_traits & CopyPixelTrait) != 0)
+ if (((blur_traits & CopyPixelTrait) != 0) ||
+ (GetPixelMask(image,p+center) == 0))
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
k=kernel;
pixel=0.0;
pixels=p;
- intensity=(MagickRealType) GetPixelIntensity(image,p+center);
+ luminance_pixels=l;
gamma=0.0;
if ((blur_traits & BlendPixelTrait) == 0)
{
{
for (u=0; u < (ssize_t) width; u++)
{
- contrast=GetPixelIntensity(image,pixels)-intensity;
+ contrast=GetPixelIntensity(luminance_image,luminance_pixels)-
+ intensity;
if (fabs(contrast) < threshold)
{
pixel+=(*k)*pixels[i];
}
k++;
pixels+=GetPixelChannels(image);
+ luminance_pixels+=GetPixelChannels(luminance_image);
}
- pixels+=image->columns*GetPixelChannels(image);
+ pixels+=(image->columns-1)*GetPixelChannels(image);
+ luminance_pixels+=luminance_image->columns*
+ GetPixelChannels(luminance_image);
}
if (fabs((double) gamma) < MagickEpsilon)
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
contrast=GetPixelIntensity(image,pixels)-intensity;
if (fabs(contrast) < threshold)
{
- alpha=(MagickRealType) (QuantumScale*
- GetPixelAlpha(image,pixels));
+ alpha=(double) (QuantumScale*GetPixelAlpha(image,pixels));
pixel+=(*k)*alpha*pixels[i];
gamma+=(*k)*alpha;
}
k++;
pixels+=GetPixelChannels(image);
+ luminance_pixels+=GetPixelChannels(luminance_image);
}
- pixels+=image->columns*GetPixelChannels(image);
+ pixels+=(image->columns-1)*GetPixelChannels(image);
+ luminance_pixels+=luminance_image->columns*
+ GetPixelChannels(luminance_image);
}
if (fabs((double) gamma) < MagickEpsilon)
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
}
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ gamma=PerceptibleReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(image);
+ l+=GetPixelChannels(luminance_image);
q+=GetPixelChannels(blur_image);
}
sync=SyncCacheViewAuthenticPixels(blur_view,exception);
blur_image->type=image->type;
blur_view=DestroyCacheView(blur_view);
image_view=DestroyCacheView(image_view);
- kernel=(double *) RelinquishAlignedMemory(kernel);
+ luminance_image=DestroyImage(luminance_image);
+ kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
if (status == MagickFalse)
blur_image=DestroyImage(blur_image);
return(blur_image);
*shade_view;
Image
+ *linear_image,
*shade_image;
MagickBooleanType
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
+ linear_image=CloneImage(image,0,0,MagickTrue,exception);
shade_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
- if (shade_image == (Image *) NULL)
- return((Image *) NULL);
+ if ((linear_image == (Image *) NULL) || (shade_image == (Image *) NULL))
+ {
+ if (linear_image != (Image *) NULL)
+ linear_image=DestroyImage(linear_image);
+ if (shade_image != (Image *) NULL)
+ shade_image=DestroyImage(shade_image);
+ return((Image *) NULL);
+ }
if (SetImageStorageClass(shade_image,DirectClass,exception) == MagickFalse)
{
+ linear_image=DestroyImage(linear_image);
shade_image=DestroyImage(shade_image);
return((Image *) NULL);
}
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image,exception);
+ image_view=AcquireVirtualCacheView(linear_image,exception);
shade_view=AcquireAuthenticCacheView(shade_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ magick_threads(linear_image,shade_image,linear_image->rows,1)
#endif
- for (y=0; y < (ssize_t) image->rows; y++)
+ for (y=0; y < (ssize_t) linear_image->rows; y++)
{
- MagickRealType
+ double
distance,
normal_distance,
shade;
if (status == MagickFalse)
continue;
- p=GetCacheViewVirtualPixels(image_view,-1,y-1,image->columns+2,3,exception);
+ p=GetCacheViewVirtualPixels(image_view,-1,y-1,linear_image->columns+2,3,
+ exception);
q=QueueCacheViewAuthenticPixels(shade_view,0,y,shade_image->columns,1,
exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
Shade this row of pixels.
*/
normal.z=2.0*(double) QuantumRange; /* constant Z of surface normal */
- pre=p+GetPixelChannels(image);
- center=pre+(image->columns+2)*GetPixelChannels(image);
- post=center+(image->columns+2)*GetPixelChannels(image);
- for (x=0; x < (ssize_t) image->columns; x++)
+ pre=p+GetPixelChannels(linear_image);
+ center=pre+(linear_image->columns+2)*GetPixelChannels(linear_image);
+ post=center+(linear_image->columns+2)*GetPixelChannels(linear_image);
+ for (x=0; x < (ssize_t) linear_image->columns; x++)
{
register ssize_t
i;
/*
Determine the surface normal and compute shading.
*/
- normal.x=(double) (GetPixelIntensity(image,pre-GetPixelChannels(image))+
- GetPixelIntensity(image,center-GetPixelChannels(image))+
- GetPixelIntensity(image,post-GetPixelChannels(image))-
- GetPixelIntensity(image,pre+GetPixelChannels(image))-
- GetPixelIntensity(image,center+GetPixelChannels(image))-
- GetPixelIntensity(image,post+GetPixelChannels(image)));
- normal.y=(double) (GetPixelIntensity(image,post-GetPixelChannels(image))+
- GetPixelIntensity(image,post)+GetPixelIntensity(image,post+
- GetPixelChannels(image))-GetPixelIntensity(image,pre-
- GetPixelChannels(image))-GetPixelIntensity(image,pre)-
- GetPixelIntensity(image,pre+GetPixelChannels(image)));
+ normal.x=(double) (
+ GetPixelIntensity(linear_image,pre-GetPixelChannels(linear_image))+
+ GetPixelIntensity(linear_image,center-GetPixelChannels(linear_image))+
+ GetPixelIntensity(linear_image,post-GetPixelChannels(linear_image))-
+ GetPixelIntensity(linear_image,pre+GetPixelChannels(linear_image))-
+ GetPixelIntensity(linear_image,center+GetPixelChannels(linear_image))-
+ GetPixelIntensity(linear_image,post+GetPixelChannels(linear_image)));
+ normal.y=(double) (
+ GetPixelIntensity(linear_image,post-GetPixelChannels(linear_image))+
+ GetPixelIntensity(linear_image,post)+
+ GetPixelIntensity(linear_image,post+GetPixelChannels(linear_image))-
+ GetPixelIntensity(linear_image,pre-GetPixelChannels(linear_image))-
+ GetPixelIntensity(linear_image,pre)-
+ GetPixelIntensity(linear_image,pre+GetPixelChannels(linear_image)));
if ((normal.x == 0.0) && (normal.y == 0.0))
shade=light.z;
else
distance=normal.x*light.x+normal.y*light.y+normal.z*light.z;
if (distance > MagickEpsilon)
{
- normal_distance=
- normal.x*normal.x+normal.y*normal.y+normal.z*normal.z;
+ normal_distance=normal.x*normal.x+normal.y*normal.y+
+ normal.z*normal.z;
if (normal_distance > (MagickEpsilon*MagickEpsilon))
shade=distance/sqrt((double) normal_distance);
}
}
- if (GetPixelMask(image,p) != 0)
- {
- pre+=GetPixelChannels(image);
- center+=GetPixelChannels(image);
- post+=GetPixelChannels(image);
- q+=GetPixelChannels(shade_image);
- continue;
- }
- for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ for (i=0; i < (ssize_t) GetPixelChannels(linear_image); i++)
{
PixelChannel
channel;
shade_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- shade_traits=GetPixelChannelMapTraits(shade_image,channel);
+ channel=GetPixelChannelChannel(linear_image,i);
+ traits=GetPixelChannelTraits(linear_image,channel);
+ shade_traits=GetPixelChannelTraits(shade_image,channel);
if ((traits == UndefinedPixelTrait) ||
(shade_traits == UndefinedPixelTrait))
continue;
- if ((shade_traits & CopyPixelTrait) != 0)
+ if (((shade_traits & CopyPixelTrait) != 0) ||
+ (GetPixelMask(linear_image,center) == 0))
{
SetPixelChannel(shade_image,channel,center[i],q);
continue;
SetPixelChannel(shade_image,channel,ClampToQuantum(QuantumScale*shade*
center[i]),q);
}
- pre+=GetPixelChannels(image);
- center+=GetPixelChannels(image);
- post+=GetPixelChannels(image);
+ pre+=GetPixelChannels(linear_image);
+ center+=GetPixelChannels(linear_image);
+ post+=GetPixelChannels(linear_image);
q+=GetPixelChannels(shade_image);
}
if (SyncCacheViewAuthenticPixels(shade_view,exception) == MagickFalse)
}
shade_view=DestroyCacheView(shade_view);
image_view=DestroyCacheView(image_view);
+ linear_image=DestroyImage(linear_image);
if (status == MagickFalse)
shade_image=DestroyImage(shade_image);
return(shade_image);
const double sigma,ExceptionInfo *exception)
{
double
+ gamma,
normalize;
Image
(void) ResetMagickMemory(kernel_info,0,sizeof(*kernel_info));
kernel_info->width=width;
kernel_info->height=width;
+ kernel_info->x=(ssize_t) (width-1)/2;
+ kernel_info->y=(ssize_t) (width-1)/2;
kernel_info->signature=MagickSignature;
- kernel_info->values=(double *) AcquireAlignedMemory(
- kernel_info->width,kernel_info->width*sizeof(*kernel_info->values));
- if (kernel_info->values == (double *) NULL)
+ kernel_info->values=(MagickRealType *) MagickAssumeAligned(
+ AcquireAlignedMemory(kernel_info->width,kernel_info->height*
+ sizeof(*kernel_info->values)));
+ if (kernel_info->values == (MagickRealType *) NULL)
{
kernel_info=DestroyKernelInfo(kernel_info);
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
}
normalize=0.0;
- j=(ssize_t) kernel_info->width/2;
+ j=(ssize_t) (kernel_info->width-1)/2;
i=0;
for (v=(-j); v <= j; v++)
{
for (u=(-j); u <= j; u++)
{
- kernel_info->values[i]=(double) (-exp(-((double) u*u+v*v)/(2.0*
+ kernel_info->values[i]=(MagickRealType) (-exp(-((double) u*u+v*v)/(2.0*
MagickSigma*MagickSigma))/(2.0*MagickPI*MagickSigma*MagickSigma));
normalize+=kernel_info->values[i];
i++;
}
}
kernel_info->values[i/2]=(double) ((-2.0)*normalize);
- sharp_image=ConvolveImage(image,kernel_info,exception);
+ normalize=0.0;
+ for (i=0; i < (ssize_t) (kernel_info->width*kernel_info->height); i++)
+ normalize+=kernel_info->values[i];
+ gamma=PerceptibleReciprocal(normalize);
+ for (i=0; i < (ssize_t) (kernel_info->width*kernel_info->height); i++)
+ kernel_info->values[i]*=gamma;
+ sharp_image=MorphologyApply(image,ConvolveMorphology,1,kernel_info,
+ UndefinedCompositeOp,0.0,exception);
kernel_info=DestroyKernelInfo(kernel_info);
return(sharp_image);
}
ssize_t
y;
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
unsigned long
key;
+#endif
/*
Initialize spread image attributes.
progress=0;
width=GetOptimalKernelWidth1D(radius,0.5);
random_info=AcquireRandomInfoThreadSet();
- key=GetRandomSecretKey(random_info[0]);
image_view=AcquireVirtualCacheView(image,exception);
spread_view=AcquireAuthenticCacheView(spread_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL)
+ key=GetRandomSecretKey(random_info[0]);
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,spread_image,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
spread_view=DestroyCacheView(spread_view);
image_view=DestroyCacheView(image_view);
random_info=DestroyRandomInfoThreadSet(random_info);
+ if (status == MagickFalse)
+ spread_image=DestroyImage(spread_image);
return(spread_image);
}
\f
%
% o sigma: the standard deviation of the Gaussian, in pixels.
%
-% o amount: the percentage of the difference between the original and the
+% o gain: the percentage of the difference between the original and the
% blur image that is added back into the original.
%
-% o threshold: the threshold in pixels needed to apply the diffence amount.
+% o threshold: the threshold in pixels needed to apply the diffence gain.
%
% o exception: return any errors or warnings in this structure.
%
*/
MagickExport Image *UnsharpMaskImage(const Image *image,const double radius,
- const double sigma,const double amount,const double threshold,
+ const double sigma,const double gain,const double threshold,
ExceptionInfo *exception)
{
#define SharpenImageTag "Sharpen/Image"
MagickOffsetType
progress;
- MagickRealType
+ double
quantum_threshold;
ssize_t
unsharp_image=BlurImage(image,radius,sigma,exception);
if (unsharp_image == (Image *) NULL)
return((Image *) NULL);
- quantum_threshold=(MagickRealType) QuantumRange*threshold;
+ quantum_threshold=(double) QuantumRange*threshold;
/*
Unsharp-mask image.
*/
unsharp_view=AcquireAuthenticCacheView(unsharp_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_num_threads_dos(image->columns,image->rows)
+ magick_threads(image,unsharp_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
register ssize_t
i;
- if (GetPixelMask(image,p) != 0)
- {
- p+=GetPixelChannels(image);
- q+=GetPixelChannels(unsharp_image);
- continue;
- }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- MagickRealType
+ double
pixel;
PixelChannel
traits,
unsharp_traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- unsharp_traits=GetPixelChannelMapTraits(unsharp_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ unsharp_traits=GetPixelChannelTraits(unsharp_image,channel);
if ((traits == UndefinedPixelTrait) ||
(unsharp_traits == UndefinedPixelTrait))
continue;
- if ((unsharp_traits & CopyPixelTrait) != 0)
+ if (((unsharp_traits & CopyPixelTrait) != 0) ||
+ (GetPixelMask(image,p) != 0))
{
SetPixelChannel(unsharp_image,channel,p[i],q);
continue;
}
- pixel=p[i]-(MagickRealType) GetPixelChannel(unsharp_image,channel,q);
+ pixel=p[i]-(double) GetPixelChannel(unsharp_image,channel,q);
if (fabs(2.0*pixel) < quantum_threshold)
- pixel=(MagickRealType) p[i];
+ pixel=(double) p[i];
else
- pixel=(MagickRealType) p[i]+amount*pixel;
+ pixel=(double) p[i]+gain*pixel;
SetPixelChannel(unsharp_image,channel,ClampToQuantum(pixel),q);
}
p+=GetPixelChannels(image);
projects / imagemagick / blobdiff