% August 2009 %
% %
% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2015 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 %
struct _NodeInfo
*child[16];
- PixelPacket
+ PixelInfo
*list;
MagickSizeType
((ScaleQuantumToChar(ClampToQuantum(pixel->red)) >> index) & 0x01) |
((ScaleQuantumToChar(ClampToQuantum(pixel->green)) >> index) & 0x01) << 1 |
((ScaleQuantumToChar(ClampToQuantum(pixel->blue)) >> index) & 0x01) << 2);
- if (image->matte != MagickFalse)
+ if (image->alpha_trait != UndefinedPixelTrait)
id|=((ScaleQuantumToChar(ClampToQuantum(pixel->alpha)) >> index) &
0x01) << 3;
return(id);
}
GetPixelInfo(image,&pixel);
GetPixelInfo(image,&target);
- image_view=AcquireCacheView(image);
+ image_view=AcquireVirtualCacheView(image,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
index=MaxTreeDepth-1;
for (level=1; level < MaxTreeDepth; level++)
{
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
id=ColorToNodeId(image,&pixel,index);
if (node_info->child[id] == (NodeInfo *) NULL)
{
}
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- SetPixelInfoPacket(image,&node_info->list[i],&target);
+ target=node_info->list[i];
if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse)
break;
}
else
{
if (node_info->number_unique == 0)
- node_info->list=(PixelPacket *) AcquireMagickMemory(
+ node_info->list=(PixelInfo *) AcquireMagickMemory(
sizeof(*node_info->list));
else
- node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list,
+ node_info->list=(PixelInfo *) ResizeQuantumMemory(node_info->list,
(size_t) (i+1),sizeof(*node_info->list));
- if (node_info->list == (PixelPacket *) NULL)
+ if (node_info->list == (PixelInfo *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
return(0);
}
- node_info->list[i].red=GetPixelRed(image,p);
- node_info->list[i].green=GetPixelGreen(image,p);
- node_info->list[i].blue=GetPixelBlue(image,p);
+ node_info->list[i]=pixel;
+ node_info->list[i].red=(double) GetPixelRed(image,p);
+ node_info->list[i].green=(double) GetPixelGreen(image,p);
+ node_info->list[i].blue=(double) GetPixelBlue(image,p);
if (image->colorspace == CMYKColorspace)
- node_info->list[i].black=GetPixelBlack(image,p);
- node_info->list[i].alpha=GetPixelAlpha(image,p);
+ node_info->list[i].black=(double) GetPixelBlack(image,p);
+ node_info->list[i].alpha=(double) GetPixelAlpha(image,p);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
% The format of the DefineImageHistogram method is:
%
% DefineImageHistogram(const Image *image,NodeInfo *node_info,
-% PixelPacket **unique_colors)
+% PixelInfo **unique_colors)
%
% A description of each parameter follows.
%
%
*/
static void DefineImageHistogram(const Image *image,NodeInfo *node_info,
- PixelPacket **histogram)
+ PixelInfo **histogram)
{
register ssize_t
i;
/*
Traverse any children.
*/
- number_children=image->matte == MagickFalse ? 8UL : 16UL;
+ number_children=image->alpha_trait == UndefinedPixelTrait ? 8UL : 16UL;
for (i=0; i < (ssize_t) number_children; i++)
if (node_info->child[i] != (NodeInfo *) NULL)
DefineImageHistogram(image,node_info->child[i],histogram);
if (node_info->level == (MaxTreeDepth-1))
{
- register PixelPacket
+ register PixelInfo
*p;
p=node_info->list;
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- (*histogram)->red=p->red;
- (*histogram)->green=p->green;
- (*histogram)->blue=p->blue;
- (*histogram)->black=p->black;
- (*histogram)->alpha=p->alpha;
- (*histogram)->count=p->count;
+ **histogram=(*p);
(*histogram)++;
p++;
}
/*
Traverse any children.
*/
- number_children=image->matte == MagickFalse ? 8UL : 16UL;
+ number_children=image->alpha_trait == UndefinedPixelTrait ? 8UL : 16UL;
for (i=0; i < (ssize_t) number_children; i++)
if (node_info->child[i] != (NodeInfo *) NULL)
DestroyColorCube(image,node_info->child[i]);
- if (node_info->list != (PixelPacket *) NULL)
- node_info->list=(PixelPacket *) RelinquishMagickMemory(node_info->list);
+ if (node_info->list != (PixelInfo *) NULL)
+ node_info->list=(PixelInfo *) RelinquishMagickMemory(node_info->list);
}
\f
/*
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport PixelPacket *GetImageHistogram(const Image *image,
+MagickExport PixelInfo *GetImageHistogram(const Image *image,
size_t *number_colors,ExceptionInfo *exception)
{
- PixelPacket
+ PixelInfo
*histogram;
CubeInfo
*cube_info;
*number_colors=0;
- histogram=(PixelPacket *) NULL;
+ histogram=(PixelInfo *) NULL;
cube_info=ClassifyImageColors(image,exception);
if (cube_info != (CubeInfo *) NULL)
{
- histogram=(PixelPacket *) AcquireQuantumMemory((size_t) cube_info->colors,
+ histogram=(PixelInfo *) AcquireQuantumMemory((size_t) cube_info->colors,
sizeof(*histogram));
- if (histogram == (PixelPacket *) NULL)
+ if (histogram == (PixelInfo *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
else
{
- PixelPacket
+ PixelInfo
*root;
*number_colors=cube_info->colors;
}
GetPixelInfo(image,&pixel);
GetPixelInfo(image,&target);
- image_view=AcquireCacheView(image);
+ image_view=AcquireVirtualCacheView(image,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
index=MaxTreeDepth-1;
for (level=1; level < MaxTreeDepth; level++)
{
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
id=ColorToNodeId(image,&pixel,index);
if (node_info->child[id] == (NodeInfo *) NULL)
{
break;
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- SetPixelInfoPacket(image,&node_info->list[i],&target);
+ target=node_info->list[i];
if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse)
break;
}
Add this unique color to the color list.
*/
if (node_info->number_unique == 0)
- node_info->list=(PixelPacket *) AcquireMagickMemory(
+ node_info->list=(PixelInfo *) AcquireMagickMemory(
sizeof(*node_info->list));
else
- node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list,
+ node_info->list=(PixelInfo *) ResizeQuantumMemory(node_info->list,
(size_t) (i+1),sizeof(*node_info->list));
- if (node_info->list == (PixelPacket *) NULL)
+ if (node_info->list == (PixelInfo *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
break;
}
- node_info->list[i].red=GetPixelRed(image,p);
- node_info->list[i].green=GetPixelGreen(image,p);
- node_info->list[i].blue=GetPixelBlue(image,p);
+ node_info->list[i].red=(double) GetPixelRed(image,p);
+ node_info->list[i].green=(double) GetPixelGreen(image,p);
+ node_info->list[i].blue=(double) GetPixelBlue(image,p);
if (image->colorspace == CMYKColorspace)
- node_info->list[i].black=GetPixelBlack(image,p);
- node_info->list[i].alpha=GetPixelAlpha(image,p);
+ node_info->list[i].black=(double) GetPixelBlack(image,p);
+ node_info->list[i].alpha=(double) GetPixelAlpha(image,p);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
}
GetPixelInfo(image,&pixel);
GetPixelInfo(image,&target);
- image_view=AcquireCacheView(image);
+ image_view=AcquireVirtualCacheView(image,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
index=MaxTreeDepth-1;
for (level=1; level < MaxTreeDepth; level++)
{
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
id=ColorToNodeId(image,&pixel,index);
if (node_info->child[id] == (NodeInfo *) NULL)
{
break;
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- SetPixelInfoPacket(image,&node_info->list[i],&target);
+ target=node_info->list[i];
if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse)
break;
}
Add this unique color to the color list.
*/
if (node_info->number_unique == 0)
- node_info->list=(PixelPacket *) AcquireMagickMemory(
+ node_info->list=(PixelInfo *) AcquireMagickMemory(
sizeof(*node_info->list));
else
- node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list,
+ node_info->list=(PixelInfo *) ResizeQuantumMemory(node_info->list,
(size_t) (i+1),sizeof(*node_info->list));
- if (node_info->list == (PixelPacket *) NULL)
+ if (node_info->list == (PixelInfo *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
break;
}
- node_info->list[i].red=GetPixelRed(image,p);
- node_info->list[i].green=GetPixelGreen(image,p);
- node_info->list[i].blue=GetPixelBlue(image,p);
+ node_info->list[i]=pixel;
+ node_info->list[i].red=(double) GetPixelRed(image,p);
+ node_info->list[i].green=(double) GetPixelGreen(image,p);
+ node_info->list[i].blue=(double) GetPixelBlue(image,p);
if (image->colorspace == CMYKColorspace)
- node_info->list[i].black=GetPixelBlack(image,p);
- node_info->list[i].alpha=GetPixelAlpha(image,p);
+ node_info->list[i].black=(double) GetPixelBlack(image,p);
+ node_info->list[i].alpha=(double) GetPixelAlpha(image,p);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
% The format of the MinMaxStretchImage method is:
%
% MagickBooleanType MinMaxStretchImage(Image *image,const double black,
-% const double white,ExceptionInfo *exception)
+% const double white,const double gamma,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o black, white: move the black / white point inward from the minimum and
% maximum points by this color value.
%
+% o gamma: the gamma.
+%
% o exception: return any errors or warnings in this structure.
%
*/
MagickExport MagickBooleanType MinMaxStretchImage(Image *image,
- const double black,const double white,ExceptionInfo *exception)
+ const double black,const double white,const double gamma,
+ ExceptionInfo *exception)
{
double
min,
max;
+ register ssize_t
+ i;
+
MagickStatusType
status;
status=MagickTrue;
- if (image->sync != MagickFalse)
+ if (image->channel_mask == DefaultChannels)
{
/*
Auto-level all channels equally.
min+=black;
max-=white;
if (fabs(min-max) >= MagickEpsilon)
- status&=LevelImage(image,min,max,1.0,exception);
+ status&=LevelImage(image,min,max,gamma,exception);
return(status != 0 ? MagickTrue : MagickFalse);
}
/*
Auto-level each channel separately.
*/
- if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
- {
- PushPixelChannelMap(image,RedChannel);
- (void) GetImageRange(image,&min,&max,exception);
- min+=black;
- max-=white;
- if (fabs(min-max) >= MagickEpsilon)
- status&=LevelImage(image,min,max,1.0,exception);
- PopPixelChannelMap(image);
- }
- if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
- {
- PushPixelChannelMap(image,GreenChannel);
- (void) GetImageRange(image,&min,&max,exception);
- min+=black;
- max-=white;
- if (fabs(min-max) >= MagickEpsilon)
- status&=LevelImage(image,min,max,1.0,exception);
- PopPixelChannelMap(image);
- }
- if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
- {
- PushPixelChannelMap(image,BlueChannel);
- (void) GetImageRange(image,&min,&max,exception);
- min+=black;
- max-=white;
- if (fabs(min-max) >= MagickEpsilon)
- status&=LevelImage(image,min,max,1.0,exception);
- PopPixelChannelMap(image);
- }
- if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- PushPixelChannelMap(image,BlackChannel);
- (void) GetImageRange(image,&min,&max,exception);
- min+=black;
- max-=white;
- if (fabs(min-max) >= MagickEpsilon)
- status&=LevelImage(image,min,max,1.0,exception);
- PopPixelChannelMap(image);
- }
- if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
- (image->matte == MagickTrue))
- {
- PushPixelChannelMap(image,AlphaChannel);
- (void) GetImageRange(image,&min,&max,exception);
- min+=black;
- max-=white;
- if (fabs(min-max) >= MagickEpsilon)
- status&=LevelImage(image,min,max,1.0,exception);
- PopPixelChannelMap(image);
- }
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ ChannelType
+ channel_mask;
+
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ if ((traits & UpdatePixelTrait) == 0)
+ continue;
+ channel_mask=SetImageChannelMask(image,(ChannelType) (1 << i));
+ status&=GetImageRange(image,&min,&max,exception);
+ min+=black;
+ max-=white;
+ if (fabs(min-max) >= MagickEpsilon)
+ status&=LevelImage(image,min,max,gamma,exception);
+ (void) SetImageChannelMask(image,channel_mask);
+ }
return(status != 0 ? MagickTrue : MagickFalse);
}
\f
static int HistogramCompare(const void *x,const void *y)
{
- const PixelPacket
+ const PixelInfo
*color_1,
*color_2;
- color_1=(const PixelPacket *) x;
- color_2=(const PixelPacket *) y;
+ color_1=(const PixelInfo *) x;
+ color_2=(const PixelInfo *) y;
if (color_2->red != color_1->red)
return((int) color_1->red-(int) color_2->red);
if (color_2->green != color_1->green)
hex[MaxTextExtent],
tuple[MaxTextExtent];
- PixelPacket
+ PixelInfo
*histogram;
MagickBooleanType
PixelInfo
pixel;
- register PixelPacket
+ register PixelInfo
*p;
register ssize_t
return(number_colors);
}
histogram=GetImageHistogram(image,&number_colors,exception);
- if (histogram == (PixelPacket *) NULL)
+ if (histogram == (PixelInfo *) NULL)
return(number_colors);
qsort((void *) histogram,(size_t) number_colors,sizeof(*histogram),
HistogramCompare);
status=MagickTrue;
for (i=0; i < (ssize_t) number_colors; i++)
{
- SetPixelInfoPacket(image,p,&pixel);
+ pixel=(*p);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
ConcatenateColorComponent(&pixel,BlackPixelChannel,X11Compliance,
tuple);
}
- if (pixel.matte != MagickFalse)
+ if (pixel.alpha_trait != UndefinedPixelTrait)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
ConcatenateColorComponent(&pixel,AlphaPixelChannel,X11Compliance,
tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
- (void) QueryMagickColorname(image,&pixel,SVGCompliance,color,exception);
+ (void) QueryColorname(image,&pixel,SVGCompliance,color,exception);
GetColorTuple(&pixel,MagickTrue,hex);
- (void) FormatLocaleFile(file,"%10" MagickSizeFormat,p->count);
+ (void) FormatLocaleFile(file,"%10.20g",(double) ((MagickOffsetType)
+ p->count));
(void) FormatLocaleFile(file,": %s %s %s\n",tuple,hex,color);
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
p++;
}
(void) fflush(file);
- histogram=(PixelPacket *) RelinquishMagickMemory(histogram);
+ histogram=(PixelInfo *) RelinquishMagickMemory(histogram);
if (status == MagickFalse)
return(0);
return(number_colors);
/*
Traverse any children.
*/
- number_children=unique_image->matte == MagickFalse ? 8UL : 16UL;
+ number_children=unique_image->alpha_trait == UndefinedPixelTrait ? 8UL : 16UL;
for (i=0; i < (ssize_t) number_children; i++)
if (node_info->child[i] != (NodeInfo *) NULL)
UniqueColorsToImage(unique_image,unique_view,cube_info,
node_info->child[i],exception);
if (node_info->level == (MaxTreeDepth-1))
{
- register PixelPacket
+ register PixelInfo
*p;
register Quantum
{
q=QueueCacheViewAuthenticPixels(unique_view,cube_info->x,0,1,1,
exception);
- if (q == (const Quantum *) NULL)
+ if (q == (Quantum *) NULL)
continue;
- SetPixelRed(unique_image,p->red,q);
- SetPixelGreen(unique_image,p->green,q);
- SetPixelBlue(unique_image,p->blue,q);
- SetPixelAlpha(unique_image,p->alpha,q);
+ SetPixelRed(unique_image,ClampToQuantum(p->red),q);
+ SetPixelGreen(unique_image,ClampToQuantum(p->green),q);
+ SetPixelBlue(unique_image,ClampToQuantum(p->blue),q);
+ SetPixelAlpha(unique_image,ClampToQuantum(p->alpha),q);
if (unique_image->colorspace == CMYKColorspace)
- SetPixelBlack(unique_image,p->black,q);
+ SetPixelBlack(unique_image,ClampToQuantum(p->black),q);
if (SyncCacheViewAuthenticPixels(unique_view,exception) == MagickFalse)
break;
cube_info->x++;
unique_image=DestroyImage(unique_image);
return((Image *) NULL);
}
- unique_view=AcquireCacheView(unique_image);
+ unique_view=AcquireAuthenticCacheView(unique_image,exception);
UniqueColorsToImage(unique_image,unique_view,cube_info,cube_info->root,
exception);
unique_view=DestroyCacheView(unique_view);
quantize_info=AcquireQuantizeInfo((ImageInfo *) NULL);
quantize_info->number_colors=MaxColormapSize;
- quantize_info->dither=MagickFalse;
+ quantize_info->dither_method=NoDitherMethod;
quantize_info->tree_depth=8;
- (void) QuantizeImage(quantize_info,unique_image);
+ (void) QuantizeImage(quantize_info,unique_image,exception);
quantize_info=DestroyQuantizeInfo(quantize_info);
}
cube_info=DestroyCubeInfo(image,cube_info);
projects / imagemagick / blobdiff