% July 1998 %
% %
% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2012 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/exception.h"
#include "MagickCore/exception-private.h"
#include "MagickCore/gem.h"
+#include "MagickCore/gem-private.h"
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
#include "MagickCore/paint.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/statistic.h"
#include "MagickCore/string_.h"
#include "MagickCore/thread-private.h"
\f
% specified, the color value is changed for any neighbor pixel that does not
% match the bordercolor member of image.
%
-% By default target must match a particular pixel color exactly.
-% However, in many cases two colors may differ by a small amount. The
-% fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now
-% interpreted as the same color for the purposes of the floodfill.
+% By default target must match a particular pixel color exactly. However,
+% in many cases two colors may differ by a small amount. The fuzz member of
+% image defines how much tolerance is acceptable to consider two colors as
+% the same. For example, set fuzz to 10 and the color red at intensities of
+% 100 and 102 respectively are now interpreted as the same color for the
+% purposes of the floodfill.
%
% The format of the FloodfillPaintImage method is:
%
% MagickBooleanType FloodfillPaintImage(Image *image,
-% const ChannelType channel,const DrawInfo *draw_info,
-% const PixelInfo target,const ssize_t x_offset,
-% const ssize_t y_offset,const MagickBooleanType invert)
+% const DrawInfo *draw_info,const PixelInfo target,
+% const ssize_t x_offset,const ssize_t y_offset,
+% const MagickBooleanType invert,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image: the image.
%
-% o channel: the channel(s).
-%
% o draw_info: the draw info.
%
% o target: the RGB value of the target color.
%
% o invert: paint any pixel that does not match the target color.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
- const ChannelType channel,const DrawInfo *draw_info,
- const PixelInfo *target,const ssize_t x_offset,const ssize_t y_offset,
- const MagickBooleanType invert)
+ const DrawInfo *draw_info,const PixelInfo *target,const ssize_t x_offset,
+ const ssize_t y_offset,const MagickBooleanType invert,
+ ExceptionInfo *exception)
{
#define MaxStacksize (1UL << 15)
#define PushSegmentStack(up,left,right,delta) \
*floodplane_view,
*image_view;
- ExceptionInfo
- *exception;
-
Image
*floodplane_image;
MagickBooleanType
- skip;
+ skip,
+ status;
PixelInfo
- fill,
+ fill_color,
pixel;
- PixelPacket
- fill_color;
-
register SegmentInfo
*s;
return(MagickFalse);
if ((y_offset < 0) || (y_offset >= (ssize_t) image->rows))
return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
+ if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
- if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+ if (IsGrayColorspace(image->colorspace) != MagickFalse)
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
+ if ((image->matte == MagickFalse) && (draw_info->fill.matte != MagickFalse))
+ (void) SetImageAlpha(image,OpaqueAlpha,exception);
/*
Set floodfill state.
*/
- floodplane_image=CloneImage(image,0,0,MagickTrue,&image->exception);
+ floodplane_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+ exception);
if (floodplane_image == (Image *) NULL)
return(MagickFalse);
- (void) SetImageAlphaChannel(floodplane_image,OpaqueAlphaChannel);
+ SetImageColorspace(floodplane_image,GRAYColorspace,exception);
+ (void) EvaluateImage(floodplane_image,SetEvaluateOperator,0.0,exception);
segment_stack=(SegmentInfo *) AcquireQuantumMemory(MaxStacksize,
sizeof(*segment_stack));
if (segment_stack == (SegmentInfo *) NULL)
/*
Push initial segment on stack.
*/
- exception=(&image->exception);
+ status=MagickTrue;
x=x_offset;
y=y_offset;
start=0;
s=segment_stack;
PushSegmentStack(y,x,x,1);
PushSegmentStack(y+1,x,x,-1);
- GetPixelInfo(image,&fill);
GetPixelInfo(image,&pixel);
- image_view=AcquireCacheView(image);
- floodplane_view=AcquireCacheView(floodplane_image);
+ image_view=AcquireVirtualCacheView(image,exception);
+ floodplane_view=AcquireAuthenticCacheView(floodplane_image,exception);
while (s > segment_stack)
{
register const Quantum
*restrict p;
- register ssize_t
- x;
-
register Quantum
*restrict q;
+ register ssize_t
+ x;
+
/*
Pop segment off stack.
*/
exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- p+=x1*GetPixelComponents(image);
- q+=x1*GetPixelComponents(floodplane_image);
+ p+=x1*GetPixelChannels(image);
+ q+=x1*GetPixelChannels(floodplane_image);
for (x=x1; x >= 0; x--)
{
- if (GetPixelAlpha(image,q) == TransparentAlpha)
+ if (GetPixelGray(floodplane_image,q) != 0)
break;
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
break;
- SetPixelAlpha(floodplane_image,TransparentAlpha,q);
- p-=GetPixelComponents(image);
- q-=GetPixelComponents(floodplane_image);
+ SetPixelGray(floodplane_image,QuantumRange,q);
+ p-=GetPixelChannels(image);
+ q-=GetPixelChannels(floodplane_image);
}
if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
break;
{
p=GetCacheViewVirtualPixels(image_view,x,y,image->columns-x,1,
exception);
- q=GetCacheViewAuthenticPixels(floodplane_view,x,y,
- image->columns-x,1,exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ q=GetCacheViewAuthenticPixels(floodplane_view,x,y,image->columns-
+ x,1,exception);
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for ( ; x < (ssize_t) image->columns; x++)
{
- if (GetPixelAlpha(image,q) == TransparentAlpha)
+ if (GetPixelGray(floodplane_image,q) != 0)
break;
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
break;
- SetPixelAlpha(floodplane_image,
- TransparentAlpha,q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(floodplane_image);
+ SetPixelGray(floodplane_image,QuantumRange,q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(floodplane_image);
}
- if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
+ status=SyncCacheViewAuthenticPixels(floodplane_view,exception);
+ if (status == MagickFalse)
break;
}
PushSegmentStack(y,start,x-1,offset);
exception);
q=GetCacheViewAuthenticPixels(floodplane_view,x,y,(size_t) (x2-x+1),1,
exception);
- if ((p == (const Quantum *) NULL) ||
- (q == (Quantum *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for ( ; x <= x2; x++)
{
- if (GetPixelAlpha(image,q) == TransparentAlpha)
+ if (GetPixelGray(floodplane_image,q) != 0)
break;
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
break;
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(floodplane_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(floodplane_image);
}
}
start=x;
register const Quantum
*restrict p;
- register ssize_t
- x;
-
register Quantum
*restrict q;
+ register ssize_t
+ x;
+
/*
Tile fill color onto floodplane.
*/
- p=GetCacheViewVirtualPixels(floodplane_view,0,y,image->columns,1,
- exception);
+ p=GetCacheViewVirtualPixels(floodplane_view,0,y,image->columns,1,exception);
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelAlpha(floodplane_image,p) != OpaqueAlpha)
+ if (GetPixelGray(floodplane_image,p) != 0)
{
- (void) GetFillColor(draw_info,x,y,&fill_color);
- SetPixelInfoPacket(image,&fill_color,&fill);
- if (image->colorspace == CMYKColorspace)
- ConvertRGBToCMYK(&fill);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
- SetPixelRed(image,ClampToQuantum(fill.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
- SetPixelGreen(image,ClampToQuantum(fill.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
- SetPixelBlue(image,ClampToQuantum(fill.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelBlack(image,ClampToQuantum(fill.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
- SetPixelAlpha(image,ClampToQuantum(fill.alpha),q);
+ (void) GetFillColor(draw_info,x,y,&fill_color,exception);
+ SetPixelInfoPixel(image,&fill_color,q);
}
- p+=GetPixelComponents(floodplane_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(floodplane_image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
% The format of the GradientImage method is:
%
% MagickBooleanType GradientImage(Image *image,const GradientType type,
-% const SpreadMethod method,const PixelPacket *start_color,
-% const PixelPacket *stop_color)
+% const SpreadMethod method,const PixelInfo *start_color,
+% const PixelInfo *stop_color,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o stop_color: the stop color.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
static inline double MagickMax(const double x,const double y)
MagickExport MagickBooleanType GradientImage(Image *image,
const GradientType type,const SpreadMethod method,
- const PixelPacket *start_color,const PixelPacket *stop_color)
+ const PixelInfo *start_color,const PixelInfo *stop_color,
+ ExceptionInfo *exception)
{
DrawInfo
*draw_info;
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(start_color != (const PixelPacket *) NULL);
- assert(stop_color != (const PixelPacket *) NULL);
+ assert(start_color != (const PixelInfo *) NULL);
+ assert(stop_color != (const PixelInfo *) NULL);
draw_info=AcquireDrawInfo();
gradient=(&draw_info->gradient);
gradient->type=type;
sizeof(*gradient->stops));
for (i=0; i < (ssize_t) gradient->number_stops; i++)
GetPixelInfo(image,&gradient->stops[i].color);
- SetPixelInfoPacket(image,start_color,&gradient->stops[0].color);
+ gradient->stops[0].color=(*start_color);
gradient->stops[0].offset=0.0;
- SetPixelInfoPacket(image,stop_color,&gradient->stops[1].color);
+ gradient->stops[1].color=(*stop_color);
gradient->stops[1].offset=1.0;
/*
Draw a gradient on the image.
*/
- status=DrawGradientImage(image,draw_info);
+ status=DrawGradientImage(image,draw_info,exception);
draw_info=DestroyDrawInfo(draw_info);
- if ((start_color->alpha == OpaqueAlpha) && (stop_color->alpha == OpaqueAlpha))
+ if ((start_color->matte == MagickFalse) && (stop_color->matte == MagickFalse))
image->matte=MagickFalse;
- if ((IsPixelPacketGray(start_color) != MagickFalse) &&
- (IsPixelPacketGray(stop_color) != MagickFalse))
+ if ((IsPixelInfoGray(start_color) != MagickFalse) &&
+ (IsPixelInfoGray(stop_color) != MagickFalse))
image->type=GrayscaleType;
return(status);
}
% The format of the OilPaintImage method is:
%
% Image *OilPaintImage(const Image *image,const double radius,
-% ExceptionInfo *exception)
+% const double sigma,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o radius: the radius of the circular neighborhood.
%
+% o sigma: the standard deviation of the Gaussian, in pixels.
+%
% o exception: return any errors or warnings in this structure.
%
*/
i;
assert(histogram != (size_t **) NULL);
- for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
+ for (i=0; i < (ssize_t) GetMagickResourceLimit(ThreadResource); i++)
if (histogram[i] != (size_t *) NULL)
histogram[i]=(size_t *) RelinquishMagickMemory(histogram[i]);
histogram=(size_t **) RelinquishMagickMemory(histogram);
number_threads;
number_threads=GetOpenMPMaximumThreads();
- histogram=(size_t **) AcquireQuantumMemory(number_threads,
- sizeof(*histogram));
+ histogram=(size_t **) AcquireQuantumMemory(number_threads,sizeof(*histogram));
if (histogram == (size_t **) NULL)
return((size_t **) NULL);
(void) ResetMagickMemory(histogram,0,number_threads*sizeof(*histogram));
for (i=0; i < (ssize_t) number_threads; i++)
{
- histogram[i]=(size_t *) AcquireQuantumMemory(count,
- sizeof(**histogram));
+ histogram[i]=(size_t *) AcquireQuantumMemory(count,sizeof(**histogram));
if (histogram[i] == (size_t *) NULL)
return(DestroyHistogramThreadSet(histogram));
}
}
MagickExport Image *OilPaintImage(const Image *image,const double radius,
- ExceptionInfo *exception)
+ const double sigma,ExceptionInfo *exception)
{
#define NumberPaintBins 256
#define OilPaintImageTag "OilPaint/Image"
progress;
size_t
- **restrict histograms,
+ **histograms,
width;
ssize_t
+ center,
y;
/*
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- width=GetOptimalKernelWidth2D(radius,0.5);
+ width=GetOptimalKernelWidth2D(radius,sigma);
paint_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
if (paint_image == (Image *) NULL)
return((Image *) NULL);
- if (SetImageStorageClass(paint_image,DirectClass) == MagickFalse)
+ if (SetImageStorageClass(paint_image,DirectClass,exception) == MagickFalse)
{
- InheritException(exception,&paint_image->exception);
paint_image=DestroyImage(paint_image);
return((Image *) NULL);
}
*/
status=MagickTrue;
progress=0;
- image_view=AcquireCacheView(image);
- paint_view=AcquireCacheView(paint_image);
+ center=(ssize_t) GetPixelChannels(image)*(image->columns+width)*(width/2L)+
+ GetPixelChannels(image)*(width/2L);
+ image_view=AcquireVirtualCacheView(image,exception);
+ paint_view=AcquireAuthenticCacheView(paint_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
*restrict p;
- register ssize_t
- x;
-
register Quantum
*restrict q;
register size_t
*histogram;
+ register ssize_t
+ x;
+
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t)
ssize_t
j,
k,
+ n,
v;
/*
Assign most frequent color.
*/
- i=0;
+ k=0;
j=0;
count=0;
- (void) ResetMagickMemory(histogram,0,NumberPaintBins*sizeof(*histogram));
+ (void) ResetMagickMemory(histogram,0,NumberPaintBins* sizeof(*histogram));
for (v=0; v < (ssize_t) width; v++)
{
for (u=0; u < (ssize_t) width; u++)
{
- k=(ssize_t) ScaleQuantumToChar(GetPixelIntensity(image,p+u+i));
- histogram[k]++;
- if (histogram[k] > count)
+ n=(ssize_t) ScaleQuantumToChar(GetPixelIntensity(image,p+
+ GetPixelChannels(image)*(u+k)));
+ histogram[n]++;
+ if (histogram[n] > count)
{
- j=i+u;
- count=histogram[k];
+ j=k+u;
+ count=histogram[n];
}
}
- i+=(ssize_t) (image->columns+width);
+ k+=(ssize_t) (image->columns+width);
}
- SetPixelRed(paint_image,GetPixelRed(image,p+j*
- GetPixelComponents(image)),q);
- SetPixelGreen(paint_image,GetPixelGreen(image,p+j*
- GetPixelComponents(image)),q);
- SetPixelBlue(paint_image,GetPixelBlue(image,p+j*
- GetPixelComponents(image)),q);
- if (image->colorspace == CMYKColorspace)
- SetPixelBlack(paint_image,GetPixelBlack(image,p+j*
- GetPixelComponents(image)),q);
- if (image->matte != MagickFalse)
- SetPixelAlpha(paint_image,GetPixelAlpha(image,p+j*
- GetPixelComponents(image)),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(paint_image);
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(paint_image);
+ continue;
+ }
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel
+ channel;
+
+ PixelTrait
+ paint_traits,
+ traits;
+
+ channel=GetPixelChannelMapChannel(image,i);
+ traits=GetPixelChannelMapTraits(image,channel);
+ paint_traits=GetPixelChannelMapTraits(paint_image,channel);
+ if ((traits == UndefinedPixelTrait) ||
+ (paint_traits == UndefinedPixelTrait))
+ continue;
+ if ((paint_traits & CopyPixelTrait) != 0)
+ {
+ SetPixelChannel(paint_image,channel,p[center+i],q);
+ continue;
+ }
+ SetPixelChannel(paint_image,channel,p[j*GetPixelChannels(image)+i],q);
+ }
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(paint_image);
}
if (SyncCacheViewAuthenticPixels(paint_view,exception) == MagickFalse)
status=MagickFalse;
proceed;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_OilPaintImage)
+ #pragma omp critical (MagickCore_OilPaintImage)
#endif
proceed=SetImageProgress(image,OilPaintImageTag,progress++,image->rows);
if (proceed == MagickFalse)
% OpaquePaintImage() changes any pixel that matches color with the color
% defined by fill.
%
-% By default color must match a particular pixel color exactly. However,
-% in many cases two colors may differ by a small amount. Fuzz defines
-% how much tolerance is acceptable to consider two colors as the same.
-% For example, set fuzz to 10 and the color red at intensities of 100 and
-% 102 respectively are now interpreted as the same color.
+% By default color must match a particular pixel color exactly. However, in
+% many cases two colors may differ by a small amount. Fuzz defines how much
+% tolerance is acceptable to consider two colors as the same. For example,
+% set fuzz to 10 and the color red at intensities of 100 and 102 respectively
+% are now interpreted as the same color.
%
% The format of the OpaquePaintImage method is:
%
% MagickBooleanType OpaquePaintImage(Image *image,
-% const PixelPacket *target,const PixelPacket *fill,
-% const MagickBooleanType invert)
-% MagickBooleanType OpaquePaintImageChannel(Image *image,
-% const ChannelType channel,const PixelPacket *target,
-% const PixelPacket *fill,const MagickBooleanType invert)
+% const PixelInfo *target,const PixelInfo *fill,
+% const MagickBooleanType invert,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image: the image.
%
-% o channel: the channel(s).
-%
% o target: the RGB value of the target color.
%
% o fill: the replacement color.
%
% o invert: paint any pixel that does not match the target color.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-
MagickExport MagickBooleanType OpaquePaintImage(Image *image,
- const PixelInfo *target,const PixelInfo *fill,
- const MagickBooleanType invert)
-{
- return(OpaquePaintImageChannel(image,CompositeChannels,target,fill,invert));
-}
-
-MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image,
- const ChannelType channel,const PixelInfo *target,
- const PixelInfo *fill,const MagickBooleanType invert)
+ const PixelInfo *target,const PixelInfo *fill,const MagickBooleanType invert,
+ ExceptionInfo *exception)
{
#define OpaquePaintImageTag "Opaque/Image"
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
MagickBooleanType
status;
assert(fill != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
+ if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
+ if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
+ (IsPixelInfoGray(fill) != MagickFalse))
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
+ if ((fill->matte != MagickFalse) && (image->matte == MagickFalse))
+ (void) SetImageAlpha(image,OpaqueAlpha,exception);
/*
Make image color opaque.
*/
status=MagickTrue;
progress=0;
- exception=(&image->exception);
GetPixelInfo(image,&zero);
- image_view=AcquireCacheView(image);
+ image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
PixelInfo
pixel;
- register ssize_t
- x;
-
register Quantum
*restrict q;
+ register ssize_t
+ x;
+
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (const Quantum *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelInfo(image,q,&pixel);
+ GetPixelInfoPixel(image,q,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
- {
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
- SetPixelRed(image,ClampToQuantum(fill->red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
- SetPixelGreen(image,ClampToQuantum(fill->green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
- SetPixelBlue(image,ClampToQuantum(fill->blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelBlack(image,ClampToQuantum(fill->black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
- SetPixelAlpha(image,ClampToQuantum(fill->alpha),q);
- }
- q+=GetPixelComponents(image);
+ SetPixelInfoPixel(image,fill,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
proceed;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_OpaquePaintImageChannel)
+ #pragma omp critical (MagickCore_OpaquePaintImage)
#endif
proceed=SetImageProgress(image,OpaquePaintImageTag,progress++,
image->rows);
% TransparentPaintImage() changes the opacity value associated with any pixel
% that matches color to the value defined by opacity.
%
-% By default color must match a particular pixel color exactly. However,
-% in many cases two colors may differ by a small amount. Fuzz defines
-% how much tolerance is acceptable to consider two colors as the same.
-% For example, set fuzz to 10 and the color red at intensities of 100 and
-% 102 respectively are now interpreted as the same color.
+% By default color must match a particular pixel color exactly. However, in
+% many cases two colors may differ by a small amount. Fuzz defines how much
+% tolerance is acceptable to consider two colors as the same. For example,
+% set fuzz to 10 and the color red at intensities of 100 and 102 respectively
+% are now interpreted as the same color.
%
% The format of the TransparentPaintImage method is:
%
% MagickBooleanType TransparentPaintImage(Image *image,
% const PixelInfo *target,const Quantum opacity,
-% const MagickBooleanType invert)
+% const MagickBooleanType invert,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o invert: paint any pixel that does not match the target color.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
MagickExport MagickBooleanType TransparentPaintImage(Image *image,
- const PixelInfo *target,const Quantum opacity,
- const MagickBooleanType invert)
+ const PixelInfo *target,const Quantum opacity,const MagickBooleanType invert,
+ ExceptionInfo *exception)
{
#define TransparentPaintImageTag "Transparent/Image"
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
MagickBooleanType
status;
assert(target != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
+ if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
/*
Make image color transparent.
*/
status=MagickTrue;
progress=0;
- exception=(&image->exception);
GetPixelInfo(image,&zero);
- image_view=AcquireCacheView(image);
+ image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (const Quantum *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelInfo(image,q,&pixel);
+ GetPixelInfoPixel(image,q,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
SetPixelAlpha(image,opacity,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
proceed;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_TransparentPaintImage)
+ #pragma omp critical (MagickCore_TransparentPaintImage)
#endif
proceed=SetImageProgress(image,TransparentPaintImageTag,progress++,
image->rows);
% TransparentPaintImageChroma() changes the opacity value associated with any
% pixel that matches color to the value defined by opacity.
%
-% As there is one fuzz value for the all the channels, the
-% TransparentPaintImage() API is not suitable for the operations like chroma,
-% where the tolerance for similarity of two color component (RGB) can be
-% different, Thus we define this method take two target pixels (one
-% low and one hight) and all the pixels of an image which are lying between
-% these two pixels are made transparent.
+% As there is one fuzz value for the all the channels, TransparentPaintImage()
+% is not suitable for the operations like chroma, where the tolerance for
+% similarity of two color component (RGB) can be different. Thus we define
+% this method to take two target pixels (one low and one high) and all the
+% pixels of an image which are lying between these two pixels are made
+% transparent.
%
-% The format of the TransparentPaintImage method is:
+% The format of the TransparentPaintImageChroma method is:
%
-% MagickBooleanType TransparentPaintImage(Image *image,
-% const PixelInfo *low,const PixelInfo *hight,
-% const Quantum opacity,const MagickBooleanType invert)
+% MagickBooleanType TransparentPaintImageChroma(Image *image,
+% const PixelInfo *low,const PixelInfo *high,const Quantum opacity,
+% const MagickBooleanType invert,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o invert: paint any pixel that does not match the target color.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
- const PixelInfo *low,const PixelInfo *high,
- const Quantum opacity,const MagickBooleanType invert)
+ const PixelInfo *low,const PixelInfo *high,const Quantum opacity,
+ const MagickBooleanType invert,ExceptionInfo *exception)
{
#define TransparentPaintImageTag "Transparent/Image"
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
MagickBooleanType
status;
assert(low != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
+ if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
/*
Make image color transparent.
*/
status=MagickTrue;
progress=0;
- exception=(&image->exception);
- image_view=AcquireCacheView(image);
+ image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ dynamic_number_threads(image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
PixelInfo
pixel;
- register ssize_t
- x;
-
register Quantum
*restrict q;
+ register ssize_t
+ x;
+
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (const Quantum *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelInfo(image,q,&pixel);
+ GetPixelInfoPixel(image,q,&pixel);
match=((pixel.red >= low->red) && (pixel.red <= high->red) &&
(pixel.green >= low->green) && (pixel.green <= high->green) &&
- (pixel.blue >= low->blue) && (pixel.blue <= high->blue)) ?
- MagickTrue : MagickFalse;
+ (pixel.blue >= low->blue) && (pixel.blue <= high->blue)) ? MagickTrue :
+ MagickFalse;
if (match != invert)
SetPixelAlpha(image,opacity,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
proceed;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_TransparentPaintImageChroma)
+ #pragma omp critical (MagickCore_TransparentPaintImageChroma)
#endif
proceed=SetImageProgress(image,TransparentPaintImageTag,progress++,
image->rows);
projects / imagemagick / blobdiff