% MagickCore Image Special Effects Methods %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% October 1996 %
% %
% %
-% Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2014 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/attribute.h"
#include "MagickCore/cache.h"
#include "MagickCore/cache-view.h"
+#include "MagickCore/channel.h"
#include "MagickCore/color.h"
#include "MagickCore/color-private.h"
#include "MagickCore/colorspace-private.h"
/*
Define declarations.
*/
-#define LeftShiftOperator 0xf5
-#define RightShiftOperator 0xf6
-#define LessThanEqualOperator 0xf7
-#define GreaterThanEqualOperator 0xf8
-#define EqualOperator 0xf9
-#define NotEqualOperator 0xfa
-#define LogicalAndOperator 0xfb
-#define LogicalOrOperator 0xfc
-#define ExponentialNotation 0xfd
-
+#define LeftShiftOperator 0xf5U
+#define RightShiftOperator 0xf6U
+#define LessThanEqualOperator 0xf7U
+#define GreaterThanEqualOperator 0xf8U
+#define EqualOperator 0xf9U
+#define NotEqualOperator 0xfaU
+#define LogicalAndOperator 0xfbU
+#define LogicalOrOperator 0xfcU
+#define ExponentialNotation 0xfdU
+
struct _FxInfo
{
const Image
fx_info->exception=AcquireExceptionInfo();
fx_info->images=image;
fx_info->colors=NewSplayTree(CompareSplayTreeString,RelinquishMagickMemory,
- RelinquishMagickMemory);
+ RelinquishAlignedMemory);
fx_info->symbols=NewSplayTree(CompareSplayTreeString,RelinquishMagickMemory,
RelinquishMagickMemory);
fx_info->view=(CacheView **) AcquireQuantumMemory(GetImageListLength(
next=GetFirstImageInList(fx_info->images);
for ( ; next != (Image *) NULL; next=next->next)
{
- fx_info->view[i]=AcquireVirtualCacheView(next);
+ fx_info->view[i]=AcquireVirtualCacheView(next,exception);
i++;
}
fx_info->random_info=AcquireRandomInfo();
Force right-to-left associativity for unary negation.
*/
(void) SubstituteString(&fx_info->expression,"-","-1.0*");
+ (void) SubstituteString(&fx_info->expression,"^-1.0*","^-");
(void) SubstituteString(&fx_info->expression,"E-1.0*","E-");
(void) SubstituteString(&fx_info->expression,"e-1.0*","e-");
/*
- Convert complex to simple operators.
+ Convert compound to simple operators.
*/
fx_op[1]='\0';
*fx_op=(char) LeftShiftOperator;
noise_image=DestroyImage(noise_image);
return((Image *) NULL);
}
- if (IsGrayColorspace(image->colorspace) != MagickFalse)
- (void) TransformImageColorspace(noise_image,RGBColorspace,exception);
/*
Add noise in each row.
*/
status=MagickTrue;
progress=0;
random_info=AcquireRandomInfoThreadSet();
- image_view=AcquireVirtualCacheView(image);
- noise_view=AcquireAuthenticCacheView(noise_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ noise_view=AcquireAuthenticCacheView(noise_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
key=GetRandomSecretKey(random_info[0]);
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,key == ~0UL)
+ magick_threads(image,noise_image,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- noise_traits,
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
- noise_traits=GetPixelChannelTraits(noise_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait noise_traits=GetPixelChannelTraits(noise_image,channel);
if ((traits == UndefinedPixelTrait) ||
(noise_traits == UndefinedPixelTrait))
continue;
if (((noise_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ (GetPixelReadMask(image,p) == 0))
{
SetPixelChannel(noise_image,channel,p[i],q);
continue;
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- shift_view=AcquireAuthenticCacheView(shift_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ shift_view=AcquireAuthenticCacheView(shift_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,shift_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
clone_image=CloneImage(image,0,0,MagickTrue,exception);
if (clone_image == (Image *) NULL)
return((Image *) NULL);
- (void) SetImageType(clone_image,GrayscaleType,exception);
- edge_image=EdgeImage(clone_image,radius,sigma,exception);
+ edge_image=EdgeImage(clone_image,radius,exception);
clone_image=DestroyImage(clone_image);
if (edge_image == (Image *) NULL)
return((Image *) NULL);
return((Image *) NULL);
(void) NormalizeImage(charcoal_image,exception);
(void) NegateImage(charcoal_image,MagickFalse,exception);
- (void) SetImageType(charcoal_image,GrayscaleType,exception);
+ (void) GrayscaleImage(charcoal_image,image->intensity,exception);
return(charcoal_image);
}
\f
colorize_image=DestroyImage(colorize_image);
return((Image *) NULL);
}
- if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
+ if ((IsGrayColorspace(image->colorspace) != MagickFalse) ||
(IsPixelInfoGray(colorize) != MagickFalse))
- (void) SetImageColorspace(colorize_image,RGBColorspace,exception);
+ (void) SetImageColorspace(colorize_image,sRGBColorspace,exception);
if ((colorize_image->alpha_trait != BlendPixelTrait) &&
(colorize->alpha_trait == BlendPixelTrait))
(void) SetImageAlpha(colorize_image,OpaqueAlpha,exception);
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- colorize_view=AcquireAuthenticCacheView(colorize_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ colorize_view=AcquireAuthenticCacheView(colorize_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,colorize_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- colorize_traits,
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
- colorize_traits=GetPixelChannelTraits(colorize_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait colorize_traits=GetPixelChannelTraits(colorize_image,
+ channel);
if ((traits == UndefinedPixelTrait) ||
(colorize_traits == UndefinedPixelTrait))
continue;
if (((colorize_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ (GetPixelReadMask(image,p) == 0))
{
SetPixelChannel(colorize_image,channel,p[i],q);
continue;
}
- SetPixelChannel(colorize_image,channel,
- ClampToQuantum(Colorize(p[i],GetPixelInfoChannel(&blend_percentage,
- channel),GetPixelInfoChannel(colorize,channel))),q);
+ SetPixelChannel(colorize_image,channel,ClampToQuantum(Colorize(p[i],
+ GetPixelInfoChannel(&blend_percentage,channel),GetPixelInfoChannel(
+ colorize,channel))),q);
}
p+=GetPixelChannels(image);
q+=GetPixelChannels(colorize_image);
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- color_view=AcquireAuthenticCacheView(color_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ color_view=AcquireAuthenticCacheView(color_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,color_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
}
if (*subexpression == '\0')
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "UnbalancedParenthesis","'%s'",expression);
+ "UnbalancedParenthesis","`%s'",expression);
return(subexpression);
}
level=0;
point.x=(double) x;
point.y=(double) y;
- if (isalpha((int) *(p+1)) == 0)
+ if (isalpha((int) ((unsigned char) *(p+1))) == 0)
{
if (strchr("suv",(int) *p) != (char *) NULL)
{
if (*p == '.')
p++;
}
- if ((isalpha((int) *(p+1)) == 0) && (*p == 'p'))
+ if ((*p == 'p') && (isalpha((int) ((unsigned char) *(p+1))) == 0))
{
p++;
if (*p == '{')
if (image == (Image *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "NoSuchImage","'%s'",expression);
+ "NoSuchImage","`%s'",expression);
return(0.0);
}
GetPixelInfo(image,&pixel);
(void) InterpolatePixelInfo(image,fx_info->view[i],image->interpolate,
point.x,point.y,&pixel,exception);
if ((strlen(p) > 2) && (LocaleCompare(p,"intensity") != 0) &&
- (LocaleCompare(p,"luminance") != 0) && (LocaleCompare(p,"hue") != 0) &&
- (LocaleCompare(p,"saturation") != 0) &&
+ (LocaleCompare(p,"luma") != 0) && (LocaleCompare(p,"luminance") != 0) &&
+ (LocaleCompare(p,"hue") != 0) && (LocaleCompare(p,"saturation") != 0) &&
(LocaleCompare(p,"lightness") != 0))
{
char
if (image->colorspace != CMYKColorspace)
{
(void) ThrowMagickException(exception,GetMagickModule(),
- ImageError,"ColorSeparatedImageRequired","'%s'",
+ ImageError,"ColorSeparatedImageRequired","`%s'",
image->filename);
return(0.0);
}
break;
}
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "UnableToParseExpression","'%s'",p);
+ "UnableToParseExpression","`%s'",p);
return(0.0);
}
switch (*symbol)
default:
return(0.0);
}
- return(0.0);
}
if (LocaleCompare(symbol,"c") == 0)
return(QuantumScale*pixel.red);
if (image->colorspace != CMYKColorspace)
{
(void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"ColorSeparatedImageRequired","'%s'",
+ OptionError,"ColorSeparatedImageRequired","`%s'",
image->filename);
return(0.0);
}
&lightness);
return(lightness);
}
+ if (LocaleCompare(symbol,"luma") == 0)
+ {
+ double
+ luma;
+
+ luma=0.212656*pixel.red+0.715158*pixel.green+0.072186*pixel.blue;
+ return(QuantumScale*luma);
+ }
if (LocaleCompare(symbol,"luminance") == 0)
{
double
luminence;
- luminence=0.21267f*pixel.red+0.71516f*pixel.green+0.07217f*pixel.blue;
+ luminence=0.212656*pixel.red+0.715158*pixel.green+0.072186*pixel.blue;
return(QuantumScale*luminence);
}
break;
if (value != (const char *) NULL)
return((double) StringToDouble(value,(char **) NULL));
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "UnableToParseExpression","'%s'",symbol);
+ "UnableToParseExpression","`%s'",symbol);
return(0.0);
}
while (*expression != '\0')
{
precedence=UndefinedPrecedence;
- if ((isspace((int) ((char) *expression)) != 0) || (c == (int) '@'))
+ if ((isspace((int) ((unsigned char) *expression)) != 0) || (c == (int) '@'))
{
expression++;
continue;
}
default:
{
- if (((c != 0) && ((isdigit((int) ((char) c)) != 0) ||
- (strchr(")",c) != (char *) NULL))) &&
- (((islower((int) ((char) *expression)) != 0) ||
- (strchr("(",(int) *expression) != (char *) NULL)) ||
- ((isdigit((int) ((char) c)) == 0) &&
- (isdigit((int) ((char) *expression)) != 0))) &&
- (strchr("xy",(int) *expression) == (char *) NULL))
+ if (((c != 0) && ((isdigit((int) ((unsigned char) c)) != 0) ||
+ (strchr(")",(int) ((unsigned char) c)) != (char *) NULL))) &&
+ (((islower((int) ((unsigned char) *expression)) != 0) ||
+ (strchr("(",(int) ((unsigned char) *expression)) != (char *) NULL)) ||
+ ((isdigit((int) ((unsigned char) c)) == 0) &&
+ (isdigit((int) ((unsigned char) *expression)) != 0))) &&
+ (strchr("xy",(int) ((unsigned char) *expression)) == (char *) NULL))
precedence=MultiplyPrecedence;
break;
}
*beta=0.0;
if (exception->severity != UndefinedException)
return(0.0);
- while (isspace((int) *expression) != 0)
+ while (isspace((int) ((unsigned char) *expression)) != 0)
expression++;
if (*expression == '\0')
{
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "MissingExpression","'%s'",expression);
+ "MissingExpression","`%s'",expression);
return(0.0);
}
*subexpression='\0';
{
if (exception->severity == UndefinedException)
(void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"DivideByZero","'%s'",expression);
+ OptionError,"DivideByZero","`%s'",expression);
return(0.0);
}
return(alpha/(*beta));
if (*beta == 0.0)
{
(void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"DivideByZero","'%s'",expression);
+ OptionError,"DivideByZero","`%s'",expression);
return(0.0);
}
return(fmod((double) alpha,(double) *beta));
if (q == (char *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","'%s'",subexpression);
+ OptionError,"UnableToParseExpression","`%s'",subexpression);
return(0.0);
}
if (fabs((double) alpha) >= MagickEpsilon)
if (*q != '\0')
{
(void) ThrowMagickException(exception,GetMagickModule(),
- OptionError,"UnableToParseExpression","'%s'",subexpression);
+ OptionError,"UnableToParseExpression","`%s'",subexpression);
return(0.0);
}
ClearMagickException(exception);
if (*expression != '@')
fx_expression=ConstantString(expression);
else
- fx_expression=FileToString(expression+1,~0,exception);
+ fx_expression=FileToString(expression+1,~0UL,exception);
for (i=0; i < (ssize_t) number_threads; i++)
{
MagickBooleanType
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- fx_view=AcquireAuthenticCacheView(fx_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ fx_view=AcquireAuthenticCacheView(fx_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,fx_image,fx_image->rows,1)
#endif
for (y=0; y < (ssize_t) fx_image->rows; y++)
{
double
alpha;
- PixelChannel
- channel;
-
- PixelTrait
- fx_traits,
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
- fx_traits=GetPixelChannelTraits(fx_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait fx_traits=GetPixelChannelTraits(fx_image,channel);
if ((traits == UndefinedPixelTrait) ||
(fx_traits == UndefinedPixelTrait))
continue;
if (((fx_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ (GetPixelReadMask(image,p) == 0))
{
SetPixelChannel(fx_image,channel,p[i],q);
continue;
CacheView
*image_view,
- *implode_view;
+ *implode_view,
+ *interpolate_view;
Image
*implode_image;
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- implode_view=AcquireAuthenticCacheView(implode_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ interpolate_view=AcquireVirtualCacheView(image,exception);
+ implode_view=AcquireAuthenticCacheView(implode_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,implode_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
if (status == MagickFalse)
continue;
- p=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
+ p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(implode_view,0,y,implode_image->columns,1,
exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
/*
Determine if the pixel is within an ellipse.
*/
- if (GetPixelMask(image,p) != 0)
+ if (GetPixelReadMask(image,p) == 0)
{
+ SetPixelBackgoundColor(implode_image,q);
p+=GetPixelChannels(image);
q+=GetPixelChannels(implode_image);
continue;
if (distance >= (radius*radius))
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- implode_traits,
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
- implode_traits=GetPixelChannelTraits(implode_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait implode_traits=GetPixelChannelTraits(implode_image,
+ channel);
if ((traits == UndefinedPixelTrait) ||
(implode_traits == UndefinedPixelTrait))
continue;
if (distance > 0.0)
factor=pow(sin((double) (MagickPI*sqrt((double) distance)/radius/
2)),-amount);
- status=InterpolatePixelChannels(image,image_view,implode_image,method,
- (double) (factor*delta.x/scale.x+center.x),(double) (factor*delta.y/
- scale.y+center.y),q,exception);
+ status=InterpolatePixelChannels(image,interpolate_view,implode_image,
+ method,(double) (factor*delta.x/scale.x+center.x),(double) (factor*
+ delta.y/scale.y+center.y),q,exception);
}
p+=GetPixelChannels(image);
q+=GetPixelChannels(implode_image);
}
}
implode_view=DestroyCacheView(implode_view);
+ interpolate_view=DestroyCacheView(interpolate_view);
image_view=DestroyCacheView(image_view);
if (status == MagickFalse)
implode_image=DestroyImage(implode_image);
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport Image *MorphImages(const Image *image,
- const size_t number_frames,ExceptionInfo *exception)
+MagickExport Image *MorphImages(const Image *image,const size_t number_frames,
+ ExceptionInfo *exception)
{
#define MorphImageTag "Morph/Image"
+ double
+ alpha,
+ beta;
+
Image
*morph_image,
*morph_images;
MagickOffsetType
scene;
- double
- alpha,
- beta;
-
register const Image
*next;
morph_images=DestroyImageList(morph_images);
return((Image *) NULL);
}
- image_view=AcquireVirtualCacheView(morph_image);
- morph_view=AcquireAuthenticCacheView(morph_images);
+ image_view=AcquireVirtualCacheView(morph_image,exception);
+ morph_view=AcquireAuthenticCacheView(morph_images,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(morph_image,morph_image,morph_image->rows,1)
#endif
for (y=0; y < (ssize_t) morph_images->rows; y++)
{
for (i=0; i < (ssize_t) GetPixelChannels(morph_image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- morph_traits,
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
- morph_traits=GetPixelChannelTraits(morph_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(morph_image,i);
+ PixelTrait traits=GetPixelChannelTraits(morph_image,channel);
+ PixelTrait morph_traits=GetPixelChannelTraits(morph_images,channel);
if ((traits == UndefinedPixelTrait) ||
(morph_traits == UndefinedPixelTrait))
continue;
if (((morph_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ (GetPixelReadMask(morph_images,p) == 0))
{
SetPixelChannel(morph_image,channel,p[i],q);
continue;
double
plasma;
- PixelChannel
- channel;
-
- PixelTrait
- traits;
-
register const Quantum
*restrict u,
*restrict v;
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
if (segment->x1 != segment->x2)
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
- q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
+ q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma);
}
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
- image_view=AcquireAuthenticCacheView(image);
- u_view=AcquireVirtualCacheView(image);
- v_view=AcquireVirtualCacheView(image);
+ image_view=AcquireAuthenticCacheView(image,exception);
+ u_view=AcquireVirtualCacheView(image,exception);
+ v_view=AcquireVirtualCacheView(image,exception);
random_info=AcquireRandomInfo();
status=PlasmaImageProxy(image,image_view,u_view,v_view,random_info,segment,
attenuate,depth,exception);
DrawInfo
*annotate_info;
+ ImageInfo
+ *image_info;
+
MagickBooleanType
status;
caption_image=CloneImage(image,image->columns,1,MagickTrue,exception);
if (caption_image == (Image *) NULL)
return((Image *) NULL);
+ image_info=AcquireImageInfo();
annotate_info=CloneDrawInfo((const ImageInfo *) NULL,draw_info);
- text=InterpretImageProperties((ImageInfo *) NULL,(Image *) image,caption,
+ text=InterpretImageProperties(image_info,(Image *) image,caption,
exception);
+ image_info=DestroyImageInfo(image_info);
(void) CloneString(&annotate_info->text,text);
count=FormatMagickCaption(caption_image,annotate_info,MagickTrue,&metrics,
&text,exception);
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- sepia_view=AcquireAuthenticCacheView(sepia_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ sepia_view=AcquireAuthenticCacheView(sepia_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,sepia_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
SetPixelGreen(sepia_image,ClampToQuantum(tone),q);
if ((double) GetPixelBlue(image,q) < tone)
SetPixelBlue(sepia_image,ClampToQuantum(tone),q);
+ SetPixelAlpha(sepia_image,GetPixelAlpha(image,p),q);
p+=GetPixelChannels(image);
q+=GetPixelChannels(sepia_image);
}
if (clone_image == (Image *) NULL)
return((Image *) NULL);
if (IsGrayColorspace(image->colorspace) != MagickFalse)
- (void) TransformImageColorspace(clone_image,RGBColorspace,exception);
+ (void) SetImageColorspace(clone_image,sRGBColorspace,exception);
(void) SetImageVirtualPixelMethod(clone_image,TransparentVirtualPixelMethod,
exception);
border_info.width=(size_t) floor(2.0*sigma+0.5);
Shadow image.
*/
status=MagickTrue;
- image_view=AcquireAuthenticCacheView(border_image);
+ image_view=AcquireAuthenticCacheView(border_image,exception);
for (y=0; y < (ssize_t) border_image->rows; y++)
{
PixelInfo
#if defined(MAGICKCORE_OPENMP_SUPPORT)
key=GetRandomSecretKey(random_info[0]);
#endif
- random_view=AcquireAuthenticCacheView(random_image);
+ random_view=AcquireAuthenticCacheView(random_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(status) \
- dynamic_number_threads(image,image->columns,image->rows,key == ~0UL)
+ magick_threads(random_image,random_image,random_image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) random_image->rows; y++)
{
register ssize_t
i;
- if (GetPixelMask(random_image,q) != 0)
+ if (GetPixelReadMask(random_image,q) == 0)
{
q+=GetPixelChannels(random_image);
continue;
value=GetPseudoRandomValue(random_info[id]);
for (i=0; i < (ssize_t) GetPixelChannels(random_image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=ClampToQuantum(QuantumRange*value);
random_image=DestroyImage(random_image);
if (blur_image == (Image *) NULL)
return((Image *) NULL);
- dodge_image=EdgeImage(blur_image,radius,1.0,exception);
+ dodge_image=EdgeImage(blur_image,radius,exception);
blur_image=DestroyImage(blur_image);
if (dodge_image == (Image *) NULL)
return((Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ if (IsGrayColorspace(image->colorspace) != MagickFalse)
+ (void) SetImageColorspace(image,sRGBColorspace,exception);
if (image->storage_class == PseudoClass)
{
register ssize_t
if ((double) image->colormap[i].red > threshold)
image->colormap[i].red=QuantumRange-image->colormap[i].red;
if ((double) image->colormap[i].green > threshold)
- image->colormap[i].green=QuantumRange-
- image->colormap[i].green;
+ image->colormap[i].green=QuantumRange-image->colormap[i].green;
if ((double) image->colormap[i].blue > threshold)
- image->colormap[i].blue=QuantumRange-
- image->colormap[i].blue;
+ image->colormap[i].blue=QuantumRange-image->colormap[i].blue;
}
}
/*
*/
status=MagickTrue;
progress=0;
- image_view=AcquireAuthenticCacheView(image);
+ image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
register ssize_t
i;
- if (GetPixelMask(image,q) != 0)
+ if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
continue;
}
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
((traits & CopyPixelTrait) != 0))
continue;
depth=stegano_image->depth;
k=stegano_image->offset;
status=MagickTrue;
- watermark_view=AcquireVirtualCacheView(watermark);
- stegano_view=AcquireAuthenticCacheView(stegano_image);
+ watermark_view=AcquireVirtualCacheView(watermark,exception);
+ stegano_view=AcquireAuthenticCacheView(stegano_image,exception);
for (i=(ssize_t) depth-1; (i >= 0) && (j < (ssize_t) depth); i--)
{
for (y=0; (y < (ssize_t) watermark->rows) && (j < (ssize_t) depth); y++)
stegano_view=DestroyCacheView(stegano_view);
watermark_view=DestroyCacheView(watermark_view);
if (status == MagickFalse)
- {
- stegano_image=DestroyImage(stegano_image);
- return((Image *) NULL);
- }
+ stegano_image=DestroyImage(stegano_image);
return(stegano_image);
}
\f
}
}
if (status == MagickFalse)
- {
- stereo_image=DestroyImage(stereo_image);
- return((Image *) NULL);
- }
+ stereo_image=DestroyImage(stereo_image);
return(stereo_image);
}
\f
CacheView
*image_view,
+ *interpolate_view,
*swirl_view;
Image
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- swirl_view=AcquireAuthenticCacheView(swirl_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ interpolate_view=AcquireVirtualCacheView(image,exception);
+ swirl_view=AcquireAuthenticCacheView(swirl_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,swirl_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
if (status == MagickFalse)
continue;
- p=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
+ p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(swirl_view,0,y,swirl_image->columns,1,
exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
/*
Determine if the pixel is within an ellipse.
*/
- if (GetPixelMask(image,p) != 0)
+ if (GetPixelReadMask(image,p) == 0)
{
+ SetPixelBackgoundColor(swirl_image,q);
p+=GetPixelChannels(image);
q+=GetPixelChannels(swirl_image);
continue;
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- swirl_traits,
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
- swirl_traits=GetPixelChannelTraits(swirl_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait swirl_traits=GetPixelChannelTraits(swirl_image,channel);
if ((traits == UndefinedPixelTrait) ||
(swirl_traits == UndefinedPixelTrait))
continue;
factor=1.0-sqrt((double) distance)/radius;
sine=sin((double) (degrees*factor*factor));
cosine=cos((double) (degrees*factor*factor));
- status=InterpolatePixelChannels(image,image_view,swirl_image,method,
- ((cosine*delta.x-sine*delta.y)/scale.x+center.x),(double)
+ status=InterpolatePixelChannels(image,interpolate_view,swirl_image,
+ method,((cosine*delta.x-sine*delta.y)/scale.x+center.x),(double)
((sine*delta.x+cosine*delta.y)/scale.y+center.y),q,exception);
}
p+=GetPixelChannels(image);
}
}
swirl_view=DestroyCacheView(swirl_view);
+ interpolate_view=DestroyCacheView(interpolate_view);
image_view=DestroyCacheView(image_view);
if (status == MagickFalse)
swirl_image=DestroyImage(swirl_image);
*image_view,
*tint_view;
+ double
+ intensity;
+
GeometryInfo
geometry_info;
MagickOffsetType
progress;
- double
- intensity;
-
PixelInfo
color_vector;
}
if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
(IsPixelInfoGray(tint) == MagickFalse))
- (void) SetImageColorspace(tint_image,RGBColorspace,exception);
+ (void) SetImageColorspace(tint_image,sRGBColorspace,exception);
if (blend == (const char *) NULL)
return(tint_image);
/*
color_vector.red=geometry_info.rho;
color_vector.green=geometry_info.rho;
color_vector.blue=geometry_info.rho;
- color_vector.alpha=OpaqueAlpha;
+ color_vector.alpha=(MagickRealType) OpaqueAlpha;
if ((flags & SigmaValue) != 0)
color_vector.green=geometry_info.sigma;
if ((flags & XiValue) != 0)
color_vector.alpha=geometry_info.chi;
}
intensity=(double) GetPixelInfoIntensity(tint);
- color_vector.red=(double) (color_vector.red*tint->red/100.0-
- intensity);
- color_vector.green=(double) (color_vector.green*tint->green/100.0-
- intensity);
- color_vector.blue=(double) (color_vector.blue*tint->blue/100.0-
- intensity);
- color_vector.black=(double) (color_vector.black*tint->black/100.0-
- intensity);
- color_vector.alpha=(double) (color_vector.alpha*tint->alpha/100.0-
- intensity);
+ color_vector.red=(double) (color_vector.red*tint->red/100.0-intensity);
+ color_vector.green=(double) (color_vector.green*tint->green/100.0-intensity);
+ color_vector.blue=(double) (color_vector.blue*tint->blue/100.0-intensity);
+ color_vector.black=(double) (color_vector.black*tint->black/100.0-intensity);
+ color_vector.alpha=(double) (color_vector.alpha*tint->alpha/100.0-intensity);
/*
Tint image.
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- tint_view=AcquireAuthenticCacheView(tint_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ tint_view=AcquireAuthenticCacheView(tint_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,tint_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- tint_traits,
- traits;
-
- channel=GetPixelChannelChannel(image,i);
- traits=GetPixelChannelTraits(image,channel);
- tint_traits=GetPixelChannelTraits(tint_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait tint_traits=GetPixelChannelTraits(tint_image,channel);
if ((traits == UndefinedPixelTrait) ||
(tint_traits == UndefinedPixelTrait))
continue;
if (((tint_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ (GetPixelReadMask(image,p) == 0))
{
SetPixelChannel(tint_image,channel,p[i],q);
continue;
*/
status=MagickTrue;
progress=0;
- image_view=AcquireVirtualCacheView(image);
- wave_view=AcquireAuthenticCacheView(wave_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ wave_view=AcquireAuthenticCacheView(wave_image,exception);
(void) SetCacheViewVirtualPixelMethod(image_view,
BackgroundVirtualPixelMethod);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image,image->columns,image->rows,1)
+ magick_threads(image,wave_image,wave_image->rows,1)
#endif
for (y=0; y < (ssize_t) wave_image->rows; y++)
{
projects / imagemagick / blobdiff