% July 1992 %
% %
% %
-% 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/color-private.h"
#include "MagickCore/colormap.h"
#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
#include "MagickCore/enhance.h"
#include "MagickCore/exception.h"
#include "MagickCore/exception-private.h"
#include "MagickCore/monitor-private.h"
#include "MagickCore/option.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
#include "MagickCore/quantize.h"
#include "MagickCore/quantum.h"
#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
#include "MagickCore/string_.h"
#include "MagickCore/thread-private.h"
\f
/*
Typdef declarations.
*/
-typedef struct _RealPixelPacket
+typedef struct _RealPixelInfo
{
- MagickRealType
+ double
red,
green,
blue,
alpha;
-} RealPixelPacket;
+} RealPixelInfo;
typedef struct _NodeInfo
{
MagickSizeType
number_unique;
- RealPixelPacket
+ RealPixelInfo
total_color;
- MagickRealType
+ double
quantize_error;
size_t
MagickSizeType
transparent_pixels;
- RealPixelPacket
+ RealPixelInfo
target;
- MagickRealType
+ double
distance,
pruning_threshold,
next_threshold;
ssize_t
*cache;
- RealPixelPacket
+ RealPixelInfo
error[ErrorQueueLength];
- MagickRealType
+ double
weights[ErrorQueueLength];
QuantizeInfo
*GetNodeInfo(CubeInfo *,const size_t,const size_t,NodeInfo *);
static MagickBooleanType
- AssignImageColors(Image *,CubeInfo *),
+ AssignImageColors(Image *,CubeInfo *,ExceptionInfo *),
ClassifyImageColors(CubeInfo *,const Image *,ExceptionInfo *),
- DitherImage(Image *,CubeInfo *),
- SetGrayscaleImage(Image *);
+ DitherImage(Image *,CubeInfo *,ExceptionInfo *),
+ SetGrayscaleImage(Image *,ExceptionInfo *);
static size_t
DefineImageColormap(Image *,CubeInfo *,NodeInfo *);
const char
*option;
- quantize_info->dither=image_info->dither;
+ quantize_info->dither_method=image_info->dither == MagickFalse ?
+ NoDitherMethod : RiemersmaDitherMethod;
option=GetImageOption(image_info,"dither");
if (option != (const char *) NULL)
quantize_info->dither_method=(DitherMethod) ParseCommandOption(
*/
static inline void AssociateAlphaPixel(const Image *image,
- const CubeInfo *cube_info,const Quantum *pixel,
- RealPixelPacket *alpha_pixel)
+ const CubeInfo *cube_info,const Quantum *pixel,RealPixelInfo *alpha_pixel)
{
- MagickRealType
+ double
alpha;
if ((cube_info->associate_alpha == MagickFalse) ||
(GetPixelAlpha(image,pixel)== OpaqueAlpha))
{
- alpha_pixel->red=(MagickRealType) GetPixelRed(image,pixel);
- alpha_pixel->green=(MagickRealType) GetPixelGreen(image,pixel);
- alpha_pixel->blue=(MagickRealType) GetPixelBlue(image,pixel);
- alpha_pixel->alpha=(MagickRealType) GetPixelAlpha(image,pixel);
+ alpha_pixel->red=(double) GetPixelRed(image,pixel);
+ alpha_pixel->green=(double) GetPixelGreen(image,pixel);
+ alpha_pixel->blue=(double) GetPixelBlue(image,pixel);
+ alpha_pixel->alpha=(double) GetPixelAlpha(image,pixel);
return;
}
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,pixel));
+ alpha=(double) (QuantumScale*GetPixelAlpha(image,pixel));
alpha_pixel->red=alpha*GetPixelRed(image,pixel);
alpha_pixel->green=alpha*GetPixelGreen(image,pixel);
alpha_pixel->blue=alpha*GetPixelBlue(image,pixel);
- alpha_pixel->alpha=(MagickRealType) GetPixelAlpha(image,pixel);
+ alpha_pixel->alpha=(double) GetPixelAlpha(image,pixel);
}
-static inline void AssociateAlphaPixelPacket(const Image *image,
- const CubeInfo *cube_info,const PixelPacket *pixel,
- RealPixelPacket *alpha_pixel)
+static inline void AssociateAlphaPixelInfo(const Image *image,
+ const CubeInfo *cube_info,const PixelInfo *pixel,
+ RealPixelInfo *alpha_pixel)
{
- MagickRealType
+ double
alpha;
if ((cube_info->associate_alpha == MagickFalse) ||
(pixel->alpha == OpaqueAlpha))
{
- alpha_pixel->red=(MagickRealType) pixel->red;
- alpha_pixel->green=(MagickRealType) pixel->green;
- alpha_pixel->blue=(MagickRealType) pixel->blue;
- alpha_pixel->alpha=(MagickRealType) pixel->alpha;
+ alpha_pixel->red=(double) pixel->red;
+ alpha_pixel->green=(double) pixel->green;
+ alpha_pixel->blue=(double) pixel->blue;
+ alpha_pixel->alpha=(double) pixel->alpha;
return;
}
- alpha=(MagickRealType) (QuantumScale*pixel->alpha);
+ alpha=(double) (QuantumScale*pixel->alpha);
alpha_pixel->red=alpha*pixel->red;
alpha_pixel->green=alpha*pixel->green;
alpha_pixel->blue=alpha*pixel->blue;
- alpha_pixel->alpha=(MagickRealType) pixel->alpha;
+ alpha_pixel->alpha=(double) pixel->alpha;
}
-static inline Quantum ClampToUnsignedQuantum(const MagickRealType value)
+static inline Quantum ClampToUnsignedQuantum(const double value)
{
if (value <= 0.0)
return((Quantum) 0);
if (value >= QuantumRange)
- return((Quantum) QuantumRange);
+ return(QuantumRange);
return((Quantum) (value+0.5));
}
static inline size_t ColorToNodeId(const CubeInfo *cube_info,
- const RealPixelPacket *pixel,size_t index)
+ const RealPixelInfo *pixel,size_t index)
{
size_t
id;
return(id);
}
-static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
+static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info,
+ ExceptionInfo *exception)
{
#define AssignImageTag "Assign/Image"
if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
(cube_info->quantize_info->colorspace != CMYKColorspace))
(void) TransformImageColorspace((Image *) image,
- cube_info->quantize_info->colorspace);
+ cube_info->quantize_info->colorspace,exception);
else
- if ((image->colorspace != GRAYColorspace) &&
- (image->colorspace != RGBColorspace) &&
- (image->colorspace != CMYColorspace))
- (void) TransformImageColorspace((Image *) image,RGBColorspace);
- if (AcquireImageColormap(image,cube_info->colors) == MagickFalse)
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
+ if (AcquireImageColormap(image,cube_info->colors,exception) == MagickFalse)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
image->colors=0;
/*
Create a reduced color image.
*/
- if ((cube_info->quantize_info->dither != MagickFalse) &&
+ if ((cube_info->quantize_info->dither_method != NoDitherMethod) &&
(cube_info->quantize_info->dither_method != NoDitherMethod))
- (void) DitherImage(image,cube_info);
+ (void) DitherImage(image,cube_info,exception);
else
{
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
MagickBooleanType
status;
status=MagickTrue;
- 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(status)
+ #pragma omp parallel for schedule(static,4) shared(status) \
+ dynamic_number_threads(image,image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (const Quantum *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
cube=(*cube_info);
for (x=0; x < (ssize_t) image->columns; x+=count)
{
- RealPixelPacket
+ RealPixelInfo
pixel;
register const NodeInfo
*/
for (count=1; (x+count) < (ssize_t) image->columns; count++)
{
- PixelPacket
+ PixelInfo
packet;
- GetPixelPacket(image,q+count*GetPixelChannels(image),&packet);
+ GetPixelInfoPixel(image,q+count*GetPixelChannels(image),&packet);
if (IsPixelEquivalent(image,q,&packet) == MagickFalse)
break;
}
Find closest color among siblings and their children.
*/
cube.target=pixel;
- cube.distance=(MagickRealType) (4.0*(QuantumRange+1.0)*
+ cube.distance=(double) (4.0*(QuantumRange+1.0)*
(QuantumRange+1.0)+1.0);
ClosestColor(image,&cube,node_info->parent);
index=cube.color_number;
SetPixelIndex(image,(Quantum) index,q);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetPixelRed(image,image->colormap[index].red,q);
- SetPixelGreen(image,image->colormap[index].green,q);
- SetPixelBlue(image,image->colormap[index].blue,q);
+ SetPixelRed(image,ClampToQuantum(
+ image->colormap[index].red),q);
+ SetPixelGreen(image,ClampToQuantum(
+ image->colormap[index].green),q);
+ SetPixelBlue(image,ClampToQuantum(
+ image->colormap[index].blue),q);
if (cube.associate_alpha != MagickFalse)
- SetPixelAlpha(image,image->colormap[index].alpha,q);
+ SetPixelAlpha(image,ClampToQuantum(
+ image->colormap[index].alpha),q);
}
q+=GetPixelChannels(image);
}
image_view=DestroyCacheView(image_view);
}
if (cube_info->quantize_info->measure_error != MagickFalse)
- (void) GetImageQuantizeError(image);
+ (void) GetImageQuantizeError(image,exception);
if ((cube_info->quantize_info->number_colors == 2) &&
(cube_info->quantize_info->colorspace == GRAYColorspace))
{
- Quantum
+ double
intensity;
- register PixelPacket
+ register PixelInfo
*restrict q;
register ssize_t
q=image->colormap;
for (i=0; i < (ssize_t) image->colors; i++)
{
- intensity=(Quantum) ((MagickRealType) GetPixelPacketIntensity(q) <
- ((MagickRealType) QuantumRange/2.0) ? 0 : QuantumRange);
+ intensity=(double) ((double) GetPixelInfoIntensity(q) <
+ ((double) QuantumRange/2.0) ? 0 : QuantumRange);
q->red=intensity;
q->green=intensity;
q->blue=intensity;
q++;
}
}
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
(cube_info->quantize_info->colorspace != CMYKColorspace))
- (void) TransformImageColorspace((Image *) image,RGBColorspace);
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
return(MagickTrue);
}
\f
MagickBooleanType
associate_alpha;
- associate_alpha=image->matte;
+ associate_alpha=image->alpha_trait == BlendPixelTrait ? MagickTrue :
+ MagickFalse;
if (cube_info->quantize_info->colorspace == TransparentColorspace)
associate_alpha=MagickFalse;
if ((cube_info->quantize_info->number_colors == 2) &&
MagickBooleanType
proceed;
- MagickRealType
+ double
bisect;
NodeInfo
*node_info;
- RealPixelPacket
+ RealPixelInfo
error,
mid,
midpoint,
if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
(cube_info->quantize_info->colorspace != CMYKColorspace))
(void) TransformImageColorspace((Image *) image,
- cube_info->quantize_info->colorspace);
+ cube_info->quantize_info->colorspace,exception);
else
- if ((image->colorspace != GRAYColorspace) &&
- (image->colorspace != CMYColorspace) &&
- (image->colorspace != RGBColorspace))
- (void) TransformImageColorspace((Image *) image,RGBColorspace);
- midpoint.red=(MagickRealType) QuantumRange/2.0;
- midpoint.green=(MagickRealType) QuantumRange/2.0;
- midpoint.blue=(MagickRealType) QuantumRange/2.0;
- midpoint.alpha=(MagickRealType) QuantumRange/2.0;
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
+ midpoint.red=(double) QuantumRange/2.0;
+ midpoint.green=(double) QuantumRange/2.0;
+ midpoint.blue=(double) QuantumRange/2.0;
+ midpoint.alpha=(double) QuantumRange/2.0;
error.alpha=0.0;
- image_view=AcquireCacheView(image);
+ image_view=AcquireVirtualCacheView(image,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
*/
for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++)
{
- PixelPacket
+ PixelInfo
packet;
- GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+ GetPixelInfoPixel(image,p+count*GetPixelChannels(image),&packet);
if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
break;
}
AssociateAlphaPixel(image,cube_info,p,&pixel);
index=MaxTreeDepth-1;
- bisect=((MagickRealType) QuantumRange+1.0)/2.0;
+ bisect=((double) QuantumRange+1.0)/2.0;
mid=midpoint;
node_info=cube_info->root;
for (level=1; level <= MaxTreeDepth; level++)
node_info->child[id]=GetNodeInfo(cube_info,id,level,node_info);
if (node_info->child[id] == (NodeInfo *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",
+ ResourceLimitError,"MemoryAllocationFailed","'%s'",
image->filename);
if (level == MaxTreeDepth)
cube_info->colors++;
*/
for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++)
{
- PixelPacket
+ PixelInfo
packet;
- GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+ GetPixelInfoPixel(image,p+count*GetPixelChannels(image),&packet);
if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
break;
}
AssociateAlphaPixel(image,cube_info,p,&pixel);
index=MaxTreeDepth-1;
- bisect=((MagickRealType) QuantumRange+1.0)/2.0;
+ bisect=((double) QuantumRange+1.0)/2.0;
mid=midpoint;
node_info=cube_info->root;
for (level=1; level <= cube_info->depth; level++)
image_view=DestroyCacheView(image_view);
if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
(cube_info->quantize_info->colorspace != CMYKColorspace))
- (void) TransformImageColorspace((Image *) image,RGBColorspace);
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
return(MagickTrue);
}
\f
return(clone_info);
clone_info->number_colors=quantize_info->number_colors;
clone_info->tree_depth=quantize_info->tree_depth;
- clone_info->dither=quantize_info->dither;
clone_info->dither_method=quantize_info->dither_method;
clone_info->colorspace=quantize_info->colorspace;
clone_info->measure_error=quantize_info->measure_error;
ClosestColor(image,cube_info,node_info->child[i]);
if (node_info->number_unique != 0)
{
- MagickRealType
+ double
pixel;
- register MagickRealType
+ register double
alpha,
beta,
distance;
- register PixelPacket
+ register PixelInfo
*restrict p;
- register RealPixelPacket
+ register RealPixelInfo
*restrict q;
/*
beta=1.0;
if (cube_info->associate_alpha != MagickFalse)
{
- alpha=(MagickRealType) (QuantumScale*p->alpha);
- beta=(MagickRealType) (QuantumScale*q->alpha);
+ alpha=(double) (QuantumScale*p->alpha);
+ beta=(double) (QuantumScale*q->alpha);
}
pixel=alpha*p->red-beta*q->red;
distance=pixel*pixel;
%
% The format of the CompressImageColormap method is:
%
-% MagickBooleanType CompressImageColormap(Image *image)
+% MagickBooleanType CompressImageColormap(Image *image,
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image: the image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-MagickExport MagickBooleanType CompressImageColormap(Image *image)
+MagickExport MagickBooleanType CompressImageColormap(Image *image,
+ ExceptionInfo *exception)
{
QuantizeInfo
quantize_info;
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (IsPaletteImage(image,&image->exception) == MagickFalse)
+ if (IsPaletteImage(image,exception) == MagickFalse)
return(MagickFalse);
GetQuantizeInfo(&quantize_info);
quantize_info.number_colors=image->colors;
quantize_info.tree_depth=MaxTreeDepth;
- return(QuantizeImage(&quantize_info,image));
+ return(QuantizeImage(&quantize_info,image,exception));
}
\f
/*
(void) DefineImageColormap(image,cube_info,node_info->child[i]);
if (node_info->number_unique != 0)
{
- register MagickRealType
+ register double
alpha;
- register PixelPacket
+ register PixelInfo
*restrict q;
/*
Colormap entry is defined by the mean color in this cube.
*/
q=image->colormap+image->colors;
- alpha=(MagickRealType) ((MagickOffsetType) node_info->number_unique);
- alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
+ alpha=(double) ((MagickOffsetType) node_info->number_unique);
+ alpha=MagickEpsilonReciprocal(alpha);
if (cube_info->associate_alpha == MagickFalse)
{
- q->red=ClampToQuantum((MagickRealType)
- (alpha*QuantumRange*node_info->total_color.red));
- q->green=ClampToQuantum((MagickRealType)
- (alpha*QuantumRange*node_info->total_color.green));
- q->blue=ClampToQuantum((MagickRealType)
- (alpha*QuantumRange*node_info->total_color.blue));
+ q->red=(double) ClampToQuantum(alpha*QuantumRange*
+ node_info->total_color.red);
+ q->green=(double) ClampToQuantum(alpha*QuantumRange*
+ node_info->total_color.green);
+ q->blue=(double) ClampToQuantum(alpha*(double) QuantumRange*
+ node_info->total_color.blue);
q->alpha=OpaqueAlpha;
}
else
{
- MagickRealType
+ double
opacity;
- opacity=(MagickRealType) (alpha*QuantumRange*
+ opacity=(double) (alpha*QuantumRange*
node_info->total_color.alpha);
- q->alpha=ClampToQuantum(opacity);
+ q->alpha=(double) ClampToQuantum(opacity);
if (q->alpha == OpaqueAlpha)
{
- q->red=ClampToQuantum((MagickRealType)
- (alpha*QuantumRange*node_info->total_color.red));
- q->green=ClampToQuantum((MagickRealType)
- (alpha*QuantumRange*node_info->total_color.green));
- q->blue=ClampToQuantum((MagickRealType)
- (alpha*QuantumRange*node_info->total_color.blue));
+ q->red=(double) ClampToQuantum(alpha*QuantumRange*
+ node_info->total_color.red);
+ q->green=(double) ClampToQuantum(alpha*QuantumRange*
+ node_info->total_color.green);
+ q->blue=(double) ClampToQuantum(alpha*QuantumRange*
+ node_info->total_color.blue);
}
else
{
- MagickRealType
+ double
gamma;
- gamma=(MagickRealType) (QuantumScale*q->alpha);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- q->red=ClampToQuantum((MagickRealType)
- (alpha*gamma*QuantumRange*node_info->total_color.red));
- q->green=ClampToQuantum((MagickRealType)
- (alpha*gamma*QuantumRange*node_info->total_color.green));
- q->blue=ClampToQuantum((MagickRealType)
- (alpha*gamma*QuantumRange*node_info->total_color.blue));
+ gamma=(double) (QuantumScale*q->alpha);
+ gamma=MagickEpsilonReciprocal(gamma);
+ q->red=(double) ClampToQuantum(alpha*gamma*QuantumRange*
+ node_info->total_color.red);
+ q->green=(double) ClampToQuantum(alpha*gamma*QuantumRange*
+ node_info->total_color.green);
+ q->blue=(double) ClampToQuantum(alpha*gamma*QuantumRange*
+ node_info->total_color.blue);
if (node_info->number_unique > cube_info->transparent_pixels)
{
cube_info->transparent_pixels=node_info->number_unique;
%
% The format of the DitherImage method is:
%
-% MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info)
+% MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info,
+% ExceptionInfo *exception)
%
% A description of each parameter follows.
%
%
% o cube_info: A pointer to the Cube structure.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-static RealPixelPacket **DestroyPixelThreadSet(RealPixelPacket **pixels)
+static RealPixelInfo **DestroyPixelThreadSet(RealPixelInfo **pixels)
{
register ssize_t
i;
- assert(pixels != (RealPixelPacket **) NULL);
- for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
- if (pixels[i] != (RealPixelPacket *) NULL)
- pixels[i]=(RealPixelPacket *) RelinquishMagickMemory(pixels[i]);
- pixels=(RealPixelPacket **) RelinquishMagickMemory(pixels);
+ assert(pixels != (RealPixelInfo **) NULL);
+ for (i=0; i < (ssize_t) GetMagickResourceLimit(ThreadResource); i++)
+ if (pixels[i] != (RealPixelInfo *) NULL)
+ pixels[i]=(RealPixelInfo *) RelinquishMagickMemory(pixels[i]);
+ pixels=(RealPixelInfo **) RelinquishMagickMemory(pixels);
return(pixels);
}
-static RealPixelPacket **AcquirePixelThreadSet(const size_t count)
+static RealPixelInfo **AcquirePixelThreadSet(const size_t count)
{
- RealPixelPacket
+ RealPixelInfo
**pixels;
register ssize_t
size_t
number_threads;
- number_threads=GetOpenMPMaximumThreads();
- pixels=(RealPixelPacket **) AcquireQuantumMemory(number_threads,
+ number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
+ pixels=(RealPixelInfo **) AcquireQuantumMemory(number_threads,
sizeof(*pixels));
- if (pixels == (RealPixelPacket **) NULL)
- return((RealPixelPacket **) NULL);
+ if (pixels == (RealPixelInfo **) NULL)
+ return((RealPixelInfo **) NULL);
(void) ResetMagickMemory(pixels,0,number_threads*sizeof(*pixels));
for (i=0; i < (ssize_t) number_threads; i++)
{
- pixels[i]=(RealPixelPacket *) AcquireQuantumMemory(count,
+ pixels[i]=(RealPixelInfo *) AcquireQuantumMemory(count,
2*sizeof(**pixels));
- if (pixels[i] == (RealPixelPacket *) NULL)
+ if (pixels[i] == (RealPixelInfo *) NULL)
return(DestroyPixelThreadSet(pixels));
}
return(pixels);
}
static inline ssize_t CacheOffset(CubeInfo *cube_info,
- const RealPixelPacket *pixel)
+ const RealPixelInfo *pixel)
{
#define RedShift(pixel) (((pixel) >> CacheShift) << (0*(8-CacheShift)))
#define GreenShift(pixel) (((pixel) >> CacheShift) << (1*(8-CacheShift)))
return(offset);
}
-static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
+static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info,
+ ExceptionInfo *exception)
{
#define DitherImageTag "Dither/Image"
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
MagickBooleanType
status;
- RealPixelPacket
+ RealPixelInfo
**pixels;
ssize_t
Distribute quantization error using Floyd-Steinberg.
*/
pixels=AcquirePixelThreadSet(image->columns);
- if (pixels == (RealPixelPacket **) NULL)
+ if (pixels == (RealPixelInfo **) NULL)
return(MagickFalse);
- exception=(&image->exception);
status=MagickTrue;
- image_view=AcquireCacheView(image);
+ image_view=AcquireAuthenticCacheView(image,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
const int
CubeInfo
cube;
- RealPixelPacket
+ RealPixelInfo
*current,
*previous;
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;
v=(ssize_t) ((y & 0x01) != 0 ? -1 : 1);
for (x=0; x < (ssize_t) image->columns; x++)
{
- RealPixelPacket
+ RealPixelInfo
color,
pixel;
pixel.alpha+=3*previous[u-v].alpha/16;
}
}
- pixel.red=(MagickRealType) ClampToUnsignedQuantum(pixel.red);
- pixel.green=(MagickRealType) ClampToUnsignedQuantum(pixel.green);
- pixel.blue=(MagickRealType) ClampToUnsignedQuantum(pixel.blue);
+ pixel.red=(double) ClampToUnsignedQuantum(pixel.red);
+ pixel.green=(double) ClampToUnsignedQuantum(pixel.green);
+ pixel.blue=(double) ClampToUnsignedQuantum(pixel.blue);
if (cube.associate_alpha != MagickFalse)
- pixel.alpha=(MagickRealType) ClampToUnsignedQuantum(pixel.alpha);
+ pixel.alpha=(double) ClampToUnsignedQuantum(pixel.alpha);
i=CacheOffset(&cube,&pixel);
if (cube.cache[i] < 0)
{
Find closest color among siblings and their children.
*/
cube.target=pixel;
- cube.distance=(MagickRealType) (4.0*(QuantumRange+1.0)*(QuantumRange+
+ cube.distance=(double) (4.0*(QuantumRange+1.0)*(QuantumRange+
1.0)+1.0);
ClosestColor(image,&cube,node_info->parent);
cube.cache[i]=(ssize_t) cube.color_number;
SetPixelIndex(image,(Quantum) index,q);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetPixelRed(image,image->colormap[index].red,q);
- SetPixelGreen(image,image->colormap[index].green,q);
- SetPixelBlue(image,image->colormap[index].blue,q);
+ SetPixelRed(image,ClampToQuantum(image->colormap[index].red),q);
+ SetPixelGreen(image,ClampToQuantum(image->colormap[index].green),q);
+ SetPixelBlue(image,ClampToQuantum(image->colormap[index].blue),q);
if (cube.associate_alpha != MagickFalse)
- SetPixelAlpha(image,image->colormap[index].alpha,q);
+ SetPixelAlpha(image,ClampToQuantum(image->colormap[index].alpha),q);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
/*
Store the error.
*/
- AssociateAlphaPixelPacket(image,&cube,image->colormap+index,&color);
+ AssociateAlphaPixelInfo(image,&cube,image->colormap+index,&color);
current[u].red=pixel.red-color.red;
current[u].green=pixel.green-color.green;
current[u].blue=pixel.blue-color.blue;
}
static MagickBooleanType
- RiemersmaDither(Image *,CacheView *,CubeInfo *,const unsigned int);
+ RiemersmaDither(Image *,CacheView *,CubeInfo *,const unsigned int,
+ ExceptionInfo *exception);
static void Riemersma(Image *image,CacheView *image_view,CubeInfo *cube_info,
- const size_t level,const unsigned int direction)
+ const size_t level,const unsigned int direction,ExceptionInfo *exception)
{
if (level == 1)
switch (direction)
{
case WestGravity:
{
- (void) RiemersmaDither(image,image_view,cube_info,EastGravity);
- (void) RiemersmaDither(image,image_view,cube_info,SouthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,WestGravity);
+ (void) RiemersmaDither(image,image_view,cube_info,EastGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,SouthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,WestGravity,
+ exception);
break;
}
case EastGravity:
{
- (void) RiemersmaDither(image,image_view,cube_info,WestGravity);
- (void) RiemersmaDither(image,image_view,cube_info,NorthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,EastGravity);
+ (void) RiemersmaDither(image,image_view,cube_info,WestGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,NorthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,EastGravity,
+ exception);
break;
}
case NorthGravity:
{
- (void) RiemersmaDither(image,image_view,cube_info,SouthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,EastGravity);
- (void) RiemersmaDither(image,image_view,cube_info,NorthGravity);
+ (void) RiemersmaDither(image,image_view,cube_info,SouthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,EastGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,NorthGravity,
+ exception);
break;
}
case SouthGravity:
{
- (void) RiemersmaDither(image,image_view,cube_info,NorthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,WestGravity);
- (void) RiemersmaDither(image,image_view,cube_info,SouthGravity);
+ (void) RiemersmaDither(image,image_view,cube_info,NorthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,WestGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,SouthGravity,
+ exception);
break;
}
default:
{
case WestGravity:
{
- Riemersma(image,image_view,cube_info,level-1,NorthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,EastGravity);
- Riemersma(image,image_view,cube_info,level-1,WestGravity);
- (void) RiemersmaDither(image,image_view,cube_info,SouthGravity);
- Riemersma(image,image_view,cube_info,level-1,WestGravity);
- (void) RiemersmaDither(image,image_view,cube_info,WestGravity);
- Riemersma(image,image_view,cube_info,level-1,SouthGravity);
+ Riemersma(image,image_view,cube_info,level-1,NorthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,EastGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,WestGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,SouthGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,WestGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,WestGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,SouthGravity,
+ exception);
break;
}
case EastGravity:
{
- Riemersma(image,image_view,cube_info,level-1,SouthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,WestGravity);
- Riemersma(image,image_view,cube_info,level-1,EastGravity);
- (void) RiemersmaDither(image,image_view,cube_info,NorthGravity);
- Riemersma(image,image_view,cube_info,level-1,EastGravity);
- (void) RiemersmaDither(image,image_view,cube_info,EastGravity);
- Riemersma(image,image_view,cube_info,level-1,NorthGravity);
+ Riemersma(image,image_view,cube_info,level-1,SouthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,WestGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,EastGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,NorthGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,EastGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,EastGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,NorthGravity,
+ exception);
break;
}
case NorthGravity:
{
- Riemersma(image,image_view,cube_info,level-1,WestGravity);
- (void) RiemersmaDither(image,image_view,cube_info,SouthGravity);
- Riemersma(image,image_view,cube_info,level-1,NorthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,EastGravity);
- Riemersma(image,image_view,cube_info,level-1,NorthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,NorthGravity);
- Riemersma(image,image_view,cube_info,level-1,EastGravity);
+ Riemersma(image,image_view,cube_info,level-1,WestGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,SouthGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,NorthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,EastGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,NorthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,NorthGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,EastGravity,
+ exception);
break;
}
case SouthGravity:
{
- Riemersma(image,image_view,cube_info,level-1,EastGravity);
- (void) RiemersmaDither(image,image_view,cube_info,NorthGravity);
- Riemersma(image,image_view,cube_info,level-1,SouthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,WestGravity);
- Riemersma(image,image_view,cube_info,level-1,SouthGravity);
- (void) RiemersmaDither(image,image_view,cube_info,SouthGravity);
- Riemersma(image,image_view,cube_info,level-1,WestGravity);
+ Riemersma(image,image_view,cube_info,level-1,EastGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,NorthGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,SouthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,WestGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,SouthGravity,
+ exception);
+ (void) RiemersmaDither(image,image_view,cube_info,SouthGravity,
+ exception);
+ Riemersma(image,image_view,cube_info,level-1,WestGravity,
+ exception);
break;
}
default:
}
static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view,
- CubeInfo *cube_info,const unsigned int direction)
+ CubeInfo *cube_info,const unsigned int direction,ExceptionInfo *exception)
{
#define DitherImageTag "Dither/Image"
MagickBooleanType
proceed;
- RealPixelPacket
+ RealPixelInfo
color,
pixel;
if ((p->x >= 0) && (p->x < (ssize_t) image->columns) &&
(p->y >= 0) && (p->y < (ssize_t) image->rows))
{
- ExceptionInfo
- *exception;
-
register Quantum
*restrict q;
/*
Distribute error.
*/
- exception=(&image->exception);
q=GetCacheViewAuthenticPixels(image_view,p->x,p->y,1,1,exception);
- if (q == (const Quantum *) NULL)
+ if (q == (Quantum *) NULL)
return(MagickFalse);
AssociateAlphaPixel(image,cube_info,q,&pixel);
for (i=0; i < ErrorQueueLength; i++)
if (cube_info->associate_alpha != MagickFalse)
pixel.alpha+=p->weights[i]*p->error[i].alpha;
}
- pixel.red=(MagickRealType) ClampToUnsignedQuantum(pixel.red);
- pixel.green=(MagickRealType) ClampToUnsignedQuantum(pixel.green);
- pixel.blue=(MagickRealType) ClampToUnsignedQuantum(pixel.blue);
+ pixel.red=(double) ClampToUnsignedQuantum(pixel.red);
+ pixel.green=(double) ClampToUnsignedQuantum(pixel.green);
+ pixel.blue=(double) ClampToUnsignedQuantum(pixel.blue);
if (cube_info->associate_alpha != MagickFalse)
- pixel.alpha=(MagickRealType) ClampToUnsignedQuantum(pixel.alpha);
+ pixel.alpha=(double) ClampToUnsignedQuantum(pixel.alpha);
i=CacheOffset(cube_info,&pixel);
if (p->cache[i] < 0)
{
Find closest color among siblings and their children.
*/
p->target=pixel;
- p->distance=(MagickRealType) (4.0*(QuantumRange+1.0)*((MagickRealType)
+ p->distance=(double) (4.0*(QuantumRange+1.0)*((double)
QuantumRange+1.0)+1.0);
ClosestColor(image,p,node_info->parent);
p->cache[i]=(ssize_t) p->color_number;
SetPixelIndex(image,(Quantum) index,q);
if (cube_info->quantize_info->measure_error == MagickFalse)
{
- SetPixelRed(image,image->colormap[index].red,q);
- SetPixelGreen(image,image->colormap[index].green,q);
- SetPixelBlue(image,image->colormap[index].blue,q);
+ SetPixelRed(image,ClampToQuantum(image->colormap[index].red),q);
+ SetPixelGreen(image,ClampToQuantum(image->colormap[index].green),q);
+ SetPixelBlue(image,ClampToQuantum(image->colormap[index].blue),q);
if (cube_info->associate_alpha != MagickFalse)
- SetPixelAlpha(image,image->colormap[index].alpha,q);
+ SetPixelAlpha(image,ClampToQuantum(image->colormap[index].alpha),q);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
return(MagickFalse);
*/
(void) CopyMagickMemory(p->error,p->error+1,(ErrorQueueLength-1)*
sizeof(p->error[0]));
- AssociateAlphaPixelPacket(image,cube_info,image->colormap+index,&color);
+ AssociateAlphaPixelInfo(image,cube_info,image->colormap+index,&color);
p->error[ErrorQueueLength-1].red=pixel.red-color.red;
p->error[ErrorQueueLength-1].green=pixel.green-color.green;
p->error[ErrorQueueLength-1].blue=pixel.blue-color.blue;
return(y);
}
-static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info)
+static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info,
+ ExceptionInfo *exception)
{
CacheView
*image_view;
depth;
if (cube_info->quantize_info->dither_method != RiemersmaDitherMethod)
- return(FloydSteinbergDither(image,cube_info));
+ return(FloydSteinbergDither(image,cube_info,exception));
/*
Distribute quantization error along a Hilbert curve.
*/
depth++;
cube_info->offset=0;
cube_info->span=(MagickSizeType) image->columns*image->rows;
- image_view=AcquireCacheView(image);
+ image_view=AcquireAuthenticCacheView(image,exception);
if (depth > 1)
- Riemersma(image,image_view,cube_info,depth-1,NorthGravity);
- status=RiemersmaDither(image,image_view,cube_info,ForgetGravity);
+ Riemersma(image,image_view,cube_info,depth-1,NorthGravity,exception);
+ status=RiemersmaDither(image,image_view,cube_info,ForgetGravity,exception);
image_view=DestroyCacheView(image_view);
return(status);
}
CubeInfo
*cube_info;
- MagickRealType
+ double
sum,
weight;
return((CubeInfo *) NULL);
cube_info->root->parent=cube_info->root;
cube_info->quantize_info=CloneQuantizeInfo(quantize_info);
- if (cube_info->quantize_info->dither == MagickFalse)
+ if (cube_info->quantize_info->dither_method == NoDitherMethod)
return(cube_info);
/*
Initialize dither resources.
weight=1.0;
for (i=0; i < ErrorQueueLength; i++)
{
- cube_info->weights[ErrorQueueLength-i-1]=1.0/weight;
+ cube_info->weights[ErrorQueueLength-i-1]=MagickEpsilonReciprocal(weight);
weight*=exp(log(((double) QuantumRange+1.0))/(ErrorQueueLength-1.0));
}
/*
%
% The format of the GetImageQuantizeError method is:
%
-% MagickBooleanType GetImageQuantizeError(Image *image)
+% MagickBooleanType GetImageQuantizeError(Image *image,
+% ExceptionInfo *exception)
%
% A description of each parameter follows.
%
% o image: the image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-MagickExport MagickBooleanType GetImageQuantizeError(Image *image)
+MagickExport MagickBooleanType GetImageQuantizeError(Image *image,
+ ExceptionInfo *exception)
{
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
- MagickRealType
+ double
alpha,
area,
beta,
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- image->total_colors=GetNumberColors(image,(FILE *) NULL,&image->exception);
+ image->total_colors=GetNumberColors(image,(FILE *) NULL,exception);
(void) ResetMagickMemory(&image->error,0,sizeof(image->error));
if (image->storage_class == DirectClass)
return(MagickTrue);
maximum_error=0.0;
mean_error_per_pixel=0.0;
mean_error=0.0;
- exception=(&image->exception);
- image_view=AcquireCacheView(image);
+ image_view=AcquireVirtualCacheView(image,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
register const Quantum
for (x=0; x < (ssize_t) image->columns; x++)
{
index=1UL*GetPixelIndex(image,p);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
{
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,p));
- beta=(MagickRealType) (QuantumScale*image->colormap[index].alpha);
+ alpha=(double) (QuantumScale*GetPixelAlpha(image,p));
+ beta=(double) (QuantumScale*image->colormap[index].alpha);
}
distance=fabs(alpha*GetPixelRed(image,p)-beta*
image->colormap[index].red);
assert(quantize_info != (QuantizeInfo *) NULL);
(void) ResetMagickMemory(quantize_info,0,sizeof(*quantize_info));
quantize_info->number_colors=256;
- quantize_info->dither=MagickTrue;
quantize_info->dither_method=RiemersmaDitherMethod;
quantize_info->colorspace=UndefinedColorspace;
quantize_info->measure_error=MagickFalse;
% %
% %
% %
-% P o s t e r i z e I m a g e C h a n n e l %
+% P o s t e r i z e I m a g e %
% %
% %
% %
% The format of the PosterizeImage method is:
%
% MagickBooleanType PosterizeImage(Image *image,const size_t levels,
-% const MagickBooleanType dither)
-% MagickBooleanType PosterizeImageChannel(Image *image,
-% const ChannelType channel,const size_t levels,
-% const MagickBooleanType dither)
+% const DitherMethod dither_method,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o levels: Number of color levels allowed in each channel. Very low values
% (2, 3, or 4) have the most visible effect.
%
-% o dither: Set this integer value to something other than zero to dither
-% the mapped image.
+% o dither_method: choose from UndefinedDitherMethod, NoDitherMethod,
+% RiemersmaDitherMethod, FloydSteinbergDitherMethod.
+%
+% o exception: return any errors or warnings in this structure.
%
*/
-static inline ssize_t MagickRound(MagickRealType x)
+static inline ssize_t MagickRound(double x)
{
/*
Round the fraction to nearest integer.
}
MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels,
- const MagickBooleanType dither)
-{
- MagickBooleanType
- status;
-
- status=PosterizeImageChannel(image,DefaultChannels,levels,dither);
- return(status);
-}
-
-MagickExport MagickBooleanType PosterizeImageChannel(Image *image,
- const ChannelType channel,const size_t levels,const MagickBooleanType dither)
+ const DitherMethod dither_method,ExceptionInfo *exception)
{
#define PosterizeImageTag "Posterize/Image"
#define PosterizePixel(pixel) (Quantum) (QuantumRange*(MagickRound( \
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
MagickBooleanType
status;
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->storage_class == PseudoClass)
#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,image->columns,1,1)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
/*
Posterize colormap.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
- image->colormap[i].red=PosterizePixel(image->colormap[i].red);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
- image->colormap[i].green=PosterizePixel(image->colormap[i].green);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
- image->colormap[i].blue=PosterizePixel(image->colormap[i].blue);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
- image->colormap[i].alpha=PosterizePixel(image->colormap[i].alpha);
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].red=(double)
+ PosterizePixel(image->colormap[i].red);
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].green=(double)
+ PosterizePixel(image->colormap[i].green);
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].blue=(double)
+ PosterizePixel(image->colormap[i].blue);
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].alpha=(double)
+ PosterizePixel(image->colormap[i].alpha);
}
/*
Posterize image.
*/
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,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;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,PosterizePixel(GetPixelRed(image,q)),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,PosterizePixel(GetPixelGreen(image,q)),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,PosterizePixel(GetPixelBlue(image,q)),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,PosterizePixel(GetPixelBlack(image,q)),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
- (image->matte == MagickTrue))
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
+ (image->alpha_trait == BlendPixelTrait))
SetPixelAlpha(image,PosterizePixel(GetPixelAlpha(image,q)),q);
q+=GetPixelChannels(image);
}
proceed;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_PosterizeImageChannel)
+ #pragma omp critical (MagickCore_PosterizeImage)
#endif
proceed=SetImageProgress(image,PosterizeImageTag,progress++,
image->rows);
quantize_info=AcquireQuantizeInfo((ImageInfo *) NULL);
quantize_info->number_colors=(size_t) MagickMin((ssize_t) levels*levels*
levels,MaxColormapSize+1);
- quantize_info->dither=dither;
+ quantize_info->dither_method=dither_method;
quantize_info->tree_depth=MaxTreeDepth;
- status=QuantizeImage(quantize_info,image);
+ status=QuantizeImage(quantize_info,image,exception);
quantize_info=DestroyQuantizeInfo(quantize_info);
return(status);
}
% The format of the QuantizeImage method is:
%
% MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info,
-% Image *image)
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o image: the image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
+
+static MagickBooleanType DirectToColormapImage(Image *image,
+ ExceptionInfo *exception)
+{
+ CacheView
+ *image_view;
+
+ MagickBooleanType
+ status;
+
+ register ssize_t
+ i;
+
+ size_t
+ number_colors;
+
+ ssize_t
+ y;
+
+ status=MagickTrue;
+ number_colors=(size_t) (image->columns*image->rows);
+ if (AcquireImageColormap(image,number_colors,exception) == MagickFalse)
+ ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
+ image->filename);
+ if (image->colors != number_colors)
+ return(MagickFalse);
+ i=0;
+ image_view=AcquireAuthenticCacheView(image,exception);
+ for (y=0; y < (ssize_t) image->rows; y++)
+ {
+ MagickBooleanType
+ proceed;
+
+ register Quantum
+ *restrict q;
+
+ register ssize_t
+ x;
+
+ q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ image->colormap[i].red=(double) GetPixelRed(image,q);
+ image->colormap[i].green=(double) GetPixelGreen(image,q);
+ image->colormap[i].blue=(double) GetPixelBlue(image,q);
+ image->colormap[i].alpha=(double) GetPixelAlpha(image,q);
+ SetPixelIndex(image,(Quantum) i,q);
+ i++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
+ break;
+ proceed=SetImageProgress(image,AssignImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
+ image_view=DestroyCacheView(image_view);
+ return(status);
+}
+
MagickExport MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info,
- Image *image)
+ Image *image,ExceptionInfo *exception)
{
CubeInfo
*cube_info;
maximum_colors=MaxColormapSize;
if (maximum_colors > MaxColormapSize)
maximum_colors=MaxColormapSize;
- if ((IsImageGray(image,&image->exception) != MagickFalse) &&
- (image->matte == MagickFalse))
- (void) SetGrayscaleImage(image);
+ if (image->alpha_trait != BlendPixelTrait)
+ {
+ if ((image->columns*image->rows) <= maximum_colors)
+ (void) DirectToColormapImage(image,exception);
+ if (IsImageGray(image,exception) != MagickFalse)
+ (void) SetGrayscaleImage(image,exception);
+ }
if ((image->storage_class == PseudoClass) &&
(image->colors <= maximum_colors))
return(MagickTrue);
colors=maximum_colors;
for (depth=1; colors != 0; depth++)
colors>>=2;
- if ((quantize_info->dither != MagickFalse) && (depth > 2))
+ if ((quantize_info->dither_method != NoDitherMethod) && (depth > 2))
depth--;
- if ((image->matte != MagickFalse) && (depth > 5))
+ if ((image->alpha_trait == BlendPixelTrait) && (depth > 5))
depth--;
}
/*
if (cube_info == (CubeInfo *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
- status=ClassifyImageColors(cube_info,image,&image->exception);
+ status=ClassifyImageColors(cube_info,image,exception);
if (status != MagickFalse)
{
/*
Reduce the number of colors in the image.
*/
ReduceImageColors(image,cube_info);
- status=AssignImageColors(image,cube_info);
+ status=AssignImageColors(image,cube_info,exception);
}
DestroyCubeInfo(cube_info);
return(status);
% The format of the QuantizeImages method is:
%
% MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info,
-% Image *images)
+% Image *images,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o images: Specifies a pointer to a list of Image structures.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info,
- Image *images)
+ Image *images,ExceptionInfo *exception)
{
CubeInfo
*cube_info;
/*
Handle a single image with QuantizeImage.
*/
- status=QuantizeImage(quantize_info,images);
+ status=QuantizeImage(quantize_info,images,exception);
return(status);
}
status=MagickFalse;
colors=maximum_colors;
for (depth=1; colors != 0; depth++)
colors>>=2;
- if (quantize_info->dither != MagickFalse)
+ if (quantize_info->dither_method != NoDitherMethod)
depth--;
}
/*
cube_info=GetCubeInfo(quantize_info,depth,maximum_colors);
if (cube_info == (CubeInfo *) NULL)
{
- (void) ThrowMagickException(&images->exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename);
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","'%s'",images->filename);
return(MagickFalse);
}
number_images=GetImageListLength(images);
{
progress_monitor=SetImageProgressMonitor(image,(MagickProgressMonitor) NULL,
image->client_data);
- status=ClassifyImageColors(cube_info,image,&image->exception);
+ status=ClassifyImageColors(cube_info,image,exception);
if (status == MagickFalse)
break;
(void) SetImageProgressMonitor(image,progress_monitor,image->client_data);
{
progress_monitor=SetImageProgressMonitor(image,(MagickProgressMonitor)
NULL,image->client_data);
- status=AssignImageColors(image,cube_info);
+ status=AssignImageColors(image,cube_info,exception);
if (status == MagickFalse)
break;
(void) SetImageProgressMonitor(image,progress_monitor,
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% RemapImage() replaces the colors of an image with the closest color from
-% a reference image.
+% RemapImage() replaces the colors of an image with a dither of the colors
+% provided.
%
% The format of the RemapImage method is:
%
% MagickBooleanType RemapImage(const QuantizeInfo *quantize_info,
-% Image *image,const Image *remap_image)
+% Image *image,const Image *remap_image,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o remap_image: the reference image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
MagickExport MagickBooleanType RemapImage(const QuantizeInfo *quantize_info,
- Image *image,const Image *remap_image)
+ Image *image,const Image *remap_image,ExceptionInfo *exception)
{
CubeInfo
*cube_info;
if (cube_info == (CubeInfo *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
- status=ClassifyImageColors(cube_info,remap_image,&image->exception);
+ status=ClassifyImageColors(cube_info,remap_image,exception);
if (status != MagickFalse)
{
/*
Classify image colors from the reference image.
*/
cube_info->quantize_info->number_colors=cube_info->colors;
- status=AssignImageColors(image,cube_info);
+ status=AssignImageColors(image,cube_info,exception);
}
DestroyCubeInfo(cube_info);
return(status);
% The format of the RemapImage method is:
%
% MagickBooleanType RemapImages(const QuantizeInfo *quantize_info,
-% Image *images,Image *remap_image)
+% Image *images,Image *remap_image,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o remap_image: the reference image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
MagickExport MagickBooleanType RemapImages(const QuantizeInfo *quantize_info,
- Image *images,const Image *remap_image)
+ Image *images,const Image *remap_image,ExceptionInfo *exception)
{
CubeInfo
*cube_info;
/*
Create a global colormap for an image sequence.
*/
- status=QuantizeImages(quantize_info,images);
+ status=QuantizeImages(quantize_info,images,exception);
return(status);
}
/*
if (cube_info == (CubeInfo *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
- status=ClassifyImageColors(cube_info,remap_image,&image->exception);
+ status=ClassifyImageColors(cube_info,remap_image,exception);
if (status != MagickFalse)
{
/*
image=images;
for ( ; image != (Image *) NULL; image=GetNextImageInList(image))
{
- status=AssignImageColors(image,cube_info);
+ status=AssignImageColors(image,cube_info,exception);
if (status == MagickFalse)
break;
}
%
% The format of the SetGrayscaleImage method is:
%
-% MagickBooleanType SetGrayscaleImage(Image *image)
+% MagickBooleanType SetGrayscaleImage(Image *image,ExceptionInfo *exeption)
%
% A description of each parameter follows:
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
#if defined(__cplusplus) || defined(c_plusplus)
static int IntensityCompare(const void *x,const void *y)
{
- PixelPacket
+ PixelInfo
*color_1,
*color_2;
ssize_t
intensity;
- color_1=(PixelPacket *) x;
- color_2=(PixelPacket *) y;
- intensity=GetPixelPacketIntensity(color_1)-(ssize_t)
- GetPixelPacketIntensity(color_2);
+ color_1=(PixelInfo *) x;
+ color_2=(PixelInfo *) y;
+ intensity=(ssize_t) (GetPixelInfoIntensity(color_1)-(ssize_t)
+ GetPixelInfoIntensity(color_2));
return((int) intensity);
}
}
#endif
-static MagickBooleanType SetGrayscaleImage(Image *image)
+static MagickBooleanType SetGrayscaleImage(Image *image,
+ ExceptionInfo *exception)
{
CacheView
*image_view;
- ExceptionInfo
- *exception;
-
MagickBooleanType
status;
- PixelPacket
+ PixelInfo
*colormap;
register ssize_t
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->type != GrayscaleType)
- (void) TransformImageColorspace(image,GRAYColorspace);
+ (void) TransformImageColorspace(image,GRAYColorspace,exception);
colormap_index=(ssize_t *) AcquireQuantumMemory(MaxMap+1,
sizeof(*colormap_index));
if (colormap_index == (ssize_t *) NULL)
image->filename);
if (image->storage_class != PseudoClass)
{
- ExceptionInfo
- *exception;
-
for (i=0; i <= (ssize_t) MaxMap; i++)
colormap_index[i]=(-1);
- if (AcquireImageColormap(image,MaxMap+1) == MagickFalse)
+ if (AcquireImageColormap(image,MaxMap+1,exception) == MagickFalse)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
image->colors=0;
status=MagickTrue;
- 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(status)
+ #pragma omp parallel for schedule(static,4) shared(status) \
+ dynamic_number_threads(image,image->columns,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (const Quantum *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
if (colormap_index[intensity] < 0)
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_SetGrayscaleImage)
+ #pragma omp critical (MagickCore_SetGrayscaleImage)
#endif
if (colormap_index[intensity] < 0)
{
colormap_index[intensity]=(ssize_t) image->colors;
- image->colormap[image->colors].red=GetPixelRed(image,q);
- image->colormap[image->colors].green=GetPixelGreen(image,q);
- image->colormap[image->colors].blue=GetPixelBlue(image,q);
+ image->colormap[image->colors].red=(double)
+ GetPixelRed(image,q);
+ image->colormap[image->colors].green=(double)
+ GetPixelGreen(image,q);
+ image->colormap[image->colors].blue=(double)
+ GetPixelBlue(image,q);
image->colors++;
}
}
- SetPixelIndex(image,(Quantum)
- colormap_index[intensity],q);
+ SetPixelIndex(image,(Quantum) colormap_index[intensity],q);
q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
image_view=DestroyCacheView(image_view);
}
for (i=0; i < (ssize_t) image->colors; i++)
- image->colormap[i].alpha=(unsigned short) i;
- qsort((void *) image->colormap,image->colors,sizeof(PixelPacket),
+ image->colormap[i].alpha=(double) i;
+ qsort((void *) image->colormap,image->colors,sizeof(PixelInfo),
IntensityCompare);
- colormap=(PixelPacket *) AcquireQuantumMemory(image->colors,
+ colormap=(PixelInfo *) AcquireQuantumMemory(image->colors,
sizeof(*colormap));
- if (colormap == (PixelPacket *) NULL)
+ if (colormap == (PixelInfo *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
j=0;
colormap[j]=image->colormap[0];
for (i=0; i < (ssize_t) image->colors; i++)
{
- if (IsPixelPacketEquivalent(&colormap[j],&image->colormap[i]) == MagickFalse)
+ if (IsPixelInfoEquivalent(&colormap[j],&image->colormap[i]) == MagickFalse)
{
j++;
colormap[j]=image->colormap[i];
colormap_index[(ssize_t) image->colormap[i].alpha]=j;
}
image->colors=(size_t) (j+1);
- image->colormap=(PixelPacket *) RelinquishMagickMemory(image->colormap);
+ image->colormap=(PixelInfo *) RelinquishMagickMemory(image->colormap);
image->colormap=colormap;
status=MagickTrue;
- 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(status)
+ #pragma omp parallel for schedule(static,4) shared(status) \
+ dynamic_number_threads(image,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;
image_view=DestroyCacheView(image_view);
colormap_index=(ssize_t *) RelinquishMagickMemory(colormap_index);
image->type=GrayscaleType;
- if (IsImageMonochrome(image,&image->exception) != MagickFalse)
+ if (IsImageMonochrome(image,exception) != MagickFalse)
image->type=BilevelType;
return(status);
}
projects / imagemagick / blobdiff