% 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 %
static MagickBooleanType
AssignImageColors(Image *,CubeInfo *,ExceptionInfo *),
ClassifyImageColors(CubeInfo *,const Image *,ExceptionInfo *),
- DitherImage(Image *,CubeInfo *),
+ DitherImage(Image *,CubeInfo *,ExceptionInfo *),
SetGrayscaleImage(Image *,ExceptionInfo *);
static size_t
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) &&
- (IsRGBColorspace(image->colorspace) == MagickFalse) &&
+ (IssRGBColorspace(image->colorspace) == MagickFalse) &&
(image->colorspace != CMYColorspace))
- (void) TransformImageColorspace((Image *) image,RGBColorspace);
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
if (AcquireImageColormap(image,cube_info->colors,exception) == MagickFalse)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
*/
if ((cube_info->quantize_info->dither != MagickFalse) &&
(cube_info->quantize_info->dither_method != NoDitherMethod))
- (void) DitherImage(image,cube_info);
+ (void) DitherImage(image,cube_info,exception);
else
{
CacheView
status;
status=MagickTrue;
- exception=(&image->exception);
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(status)
+ #pragma omp parallel for schedule(static,4) shared(status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
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 PixelInfo
q=image->colormap;
for (i=0; i < (ssize_t) image->colors; i++)
{
- intensity=(Quantum) ((MagickRealType) GetPixelInfoIntensity(q) <
+ intensity=(double) ((MagickRealType) GetPixelInfoIntensity(q) <
((MagickRealType) QuantumRange/2.0) ? 0 : QuantumRange);
q->red=intensity;
q->green=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
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) &&
- (IsRGBColorspace(image->colorspace) == MagickFalse))
- (void) TransformImageColorspace((Image *) image,RGBColorspace);
+ (IssRGBColorspace(image->colorspace) == MagickFalse))
+ (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
midpoint.red=(MagickRealType) QuantumRange/2.0;
midpoint.green=(MagickRealType) QuantumRange/2.0;
midpoint.blue=(MagickRealType) QuantumRange/2.0;
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
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;
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
if (cube_info->associate_alpha == MagickFalse)
{
- q->red=ClampToQuantum((MagickRealType)
+ q->red=(double) ClampToQuantum((MagickRealType)
(alpha*QuantumRange*node_info->total_color.red));
- q->green=ClampToQuantum((MagickRealType)
+ q->green=(double) ClampToQuantum((MagickRealType)
(alpha*QuantumRange*node_info->total_color.green));
- q->blue=ClampToQuantum((MagickRealType)
- (alpha*QuantumRange*node_info->total_color.blue));
+ q->blue=(double) ClampToQuantum((MagickRealType)
+ (alpha*(double) QuantumRange*node_info->total_color.blue));
q->alpha=OpaqueAlpha;
}
else
opacity=(MagickRealType) (alpha*QuantumRange*
node_info->total_color.alpha);
- q->alpha=ClampToQuantum(opacity);
+ q->alpha=(double) ClampToQuantum(opacity);
if (q->alpha == OpaqueAlpha)
{
- q->red=ClampToQuantum((MagickRealType)
+ q->red=(double) ClampToQuantum((MagickRealType)
(alpha*QuantumRange*node_info->total_color.red));
- q->green=ClampToQuantum((MagickRealType)
+ q->green=(double) ClampToQuantum((MagickRealType)
(alpha*QuantumRange*node_info->total_color.green));
- q->blue=ClampToQuantum((MagickRealType)
+ q->blue=(double) ClampToQuantum((MagickRealType)
(alpha*QuantumRange*node_info->total_color.blue));
}
else
gamma=(MagickRealType) (QuantumScale*q->alpha);
gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- q->red=ClampToQuantum((MagickRealType)
+ q->red=(double) ClampToQuantum((MagickRealType)
(alpha*gamma*QuantumRange*node_info->total_color.red));
- q->green=ClampToQuantum((MagickRealType)
+ q->green=(double) ClampToQuantum((MagickRealType)
(alpha*gamma*QuantumRange*node_info->total_color.green));
- q->blue=ClampToQuantum((MagickRealType)
+ q->blue=(double) ClampToQuantum((MagickRealType)
(alpha*gamma*QuantumRange*node_info->total_color.blue));
if (node_info->number_unique > cube_info->transparent_pixels)
{
%
% 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 RealPixelInfo **DestroyPixelThreadSet(RealPixelInfo **pixels)
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;
pixels=AcquirePixelThreadSet(image->columns);
if (pixels == (RealPixelInfo **) NULL)
return(MagickFalse);
- exception=(&image->exception);
status=MagickTrue;
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
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;
}
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"
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 == (Quantum *) NULL)
return(MagickFalse);
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);
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.
*/
cube_info->span=(MagickSizeType) image->columns*image->rows;
image_view=AcquireCacheView(image);
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);
}
%
% 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
alpha,
area,
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);
for (y=0; y < (ssize_t) image->rows; y++)
{
(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)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
Posterize colormap.
*/
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].red=PosterizePixel(image->colormap[i].red);
+ image->colormap[i].red=(double)
+ PosterizePixel(image->colormap[i].red);
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].green=PosterizePixel(image->colormap[i].green);
+ image->colormap[i].green=(double)
+ PosterizePixel(image->colormap[i].green);
if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].blue=PosterizePixel(image->colormap[i].blue);
+ image->colormap[i].blue=(double)
+ PosterizePixel(image->colormap[i].blue);
if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].alpha=PosterizePixel(image->colormap[i].alpha);
+ image->colormap[i].alpha=(double)
+ PosterizePixel(image->colormap[i].alpha);
}
/*
Posterize image.
progress=0;
image_view=AcquireCacheView(image);
#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)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- image->colormap[i].red=GetPixelRed(image,q);
- image->colormap[i].green=GetPixelGreen(image,q);
- image->colormap[i].blue=GetPixelBlue(image,q);
- image->colormap[i].alpha=GetPixelAlpha(image,q);
+ 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 (maximum_colors > MaxColormapSize)
maximum_colors=MaxColormapSize;
if ((image->columns*image->rows) <= maximum_colors)
- (void) DirectToColormapImage(image,&image->exception);
- if ((IsImageGray(image,&image->exception) != MagickFalse) &&
+ (void) DirectToColormapImage(image,exception);
+ if ((IsImageGray(image,exception) != MagickFalse) &&
(image->matte == MagickFalse))
(void) SetGrayscaleImage(image,exception);
if ((image->storage_class == PseudoClass) &&
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)
{
/*
cube_info=GetCubeInfo(quantize_info,depth,maximum_colors);
if (cube_info == (CubeInfo *) NULL)
{
- (void) ThrowMagickException(&images->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename);
return(MagickFalse);
}
{
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);
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% 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:
%
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)
{
/*
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)
status=MagickTrue;
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(status)
+ #pragma omp parallel for schedule(static,4) shared(status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
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++;
}
}
image_view=DestroyCacheView(image_view);
}
for (i=0; i < (ssize_t) image->colors; i++)
- image->colormap[i].alpha=(unsigned short) i;
+ image->colormap[i].alpha=(double) i;
qsort((void *) image->colormap,image->colors,sizeof(PixelInfo),
IntensityCompare);
colormap=(PixelInfo *) AcquireQuantumMemory(image->colors,
status=MagickTrue;
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(status)
+ #pragma omp parallel for schedule(static,4) shared(status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
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