% MagickCore Image Threshold Methods %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% October 1996 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
*levels;
};
\f
+/*
+ Static declarations.
+*/
+static const char
+ *MinimalThresholdMap =
+ "<?xml version=\"1.0\"?>"
+ "<thresholds>"
+ " <threshold map=\"threshold\" alias=\"1x1\">"
+ " <description>Threshold 1x1 (non-dither)</description>"
+ " <levels width=\"1\" height=\"1\" divisor=\"2\">"
+ " 1"
+ " </levels>"
+ " </threshold>"
+ " <threshold map=\"checks\" alias=\"2x1\">"
+ " <description>Checkerboard 2x1 (dither)</description>"
+ " <levels width=\"2\" height=\"2\" divisor=\"3\">"
+ " 1 2"
+ " 2 1"
+ " </levels>"
+ " </threshold>"
+ "</thresholds>";
+\f
/*
Forward declarations.
*/
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- if ((width % 2) == 0)
- ThrowImageException(OptionError,"KernelWidthMustBeAnOddNumber");
threshold_image=CloneImage(image,image->columns,image->rows,MagickTrue,
exception);
if (threshold_image == (Image *) NULL)
threshold_view=AcquireAuthenticCacheView(threshold_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,4) shared(progress,status) \
- dynamic_number_threads(image->columns,image->rows,1)
+ magick_threads(image,threshold_image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
+ double
+ channel_bias[MaxPixelChannels],
+ channel_sum[MaxPixelChannels];
+
register const Quantum
- *restrict p;
+ *restrict p,
+ *restrict pixels;
register Quantum
*restrict q;
register ssize_t
+ i,
x;
ssize_t
- center;
+ center,
+ u,
+ v;
if (status == MagickFalse)
continue;
}
center=(ssize_t) GetPixelChannels(image)*(image->columns+width)*(height/2L)+
GetPixelChannels(image)*(width/2);
- for (x=0; x < (ssize_t) image->columns; x++)
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- register ssize_t
- i;
-
- if (GetPixelMask(image,p) != 0)
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait threshold_traits=GetPixelChannelTraits(threshold_image,
+ channel);
+ if ((traits == UndefinedPixelTrait) ||
+ (threshold_traits == UndefinedPixelTrait))
+ continue;
+ if (((threshold_traits & CopyPixelTrait) != 0) ||
+ (GetPixelReadMask(image,p) == 0))
{
- p+=GetPixelChannels(image);
- q+=GetPixelChannels(threshold_image);
+ SetPixelChannel(threshold_image,channel,p[center+i],q);
continue;
}
+ pixels=p;
+ channel_bias[channel]=0.0;
+ channel_sum[channel]=0.0;
+ for (v=0; v < (ssize_t) height; v++)
+ {
+ for (u=0; u < (ssize_t) width; u++)
+ {
+ if (u == (ssize_t) (width-1))
+ channel_bias[channel]+=pixels[i];
+ channel_sum[channel]+=pixels[i];
+ pixels+=GetPixelChannels(image);
+ }
+ pixels+=(image->columns-1)*GetPixelChannels(image);
+ }
+ }
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- MagickRealType
- mean,
- pixel;
-
- PixelChannel
- channel;
-
- PixelTrait
- threshold_traits,
- traits;
-
- register const Quantum
- *restrict pixels;
-
- register ssize_t
- u;
+ double
+ mean;
- ssize_t
- v;
-
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- threshold_traits=GetPixelChannelMapTraits(threshold_image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ PixelTrait threshold_traits=GetPixelChannelTraits(threshold_image,
+ channel);
if ((traits == UndefinedPixelTrait) ||
(threshold_traits == UndefinedPixelTrait))
continue;
- if ((threshold_traits & CopyPixelTrait) != 0)
+ if (((threshold_traits & CopyPixelTrait) != 0) ||
+ (GetPixelReadMask(image,p) == 0))
{
SetPixelChannel(threshold_image,channel,p[center+i],q);
continue;
}
+ channel_sum[channel]-=channel_bias[channel];
+ channel_bias[channel]=0.0;
pixels=p;
- pixel=0.0;
for (v=0; v < (ssize_t) height; v++)
{
- for (u=0; u < (ssize_t) width; u++)
- {
- pixel+=pixels[i];
- pixels+=GetPixelChannels(image);
- }
- pixels+=image->columns*GetPixelChannels(image);
+ channel_bias[channel]+=pixels[i];
+ pixels+=(width-1)*GetPixelChannels(image);
+ channel_sum[channel]+=pixels[i];
+ pixels+=(image->columns-1)*GetPixelChannels(image);
}
- mean=(MagickRealType) (pixel/number_pixels+bias);
- SetPixelChannel(threshold_image,channel,(Quantum) ((MagickRealType)
+ mean=(double) (channel_sum[channel]/number_pixels+bias);
+ SetPixelChannel(threshold_image,channel,(Quantum) ((double)
p[center+i] <= mean ? 0 : QuantumRange),q);
}
p+=GetPixelChannels(image);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
+ if (IsGrayColorspace(image->colorspace) != MagickFalse)
+ (void) SetImageColorspace(image,sRGBColorspace,exception);
/*
Bilevel threshold image.
*/
progress=0;
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_number_threads(image->columns,image->rows,1)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
}
for (x=0; x < (ssize_t) image->columns; x++)
{
+ double
+ pixel;
+
register ssize_t
i;
- if (GetPixelMask(image,q) != 0)
+ if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
continue;
}
+ pixel=GetPixelIntensity(image,q);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- traits;
-
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
- q[i]=(Quantum) ((MagickRealType) q[i] <= threshold ? 0 : QuantumRange);
+ if (image->channel_mask != DefaultChannels)
+ pixel=(double) q[i];
+ q[i]=(Quantum) (pixel <= threshold ? 0 : QuantumRange);
}
q+=GetPixelChannels(image);
}
const char *thresholds,ExceptionInfo *exception)
{
#define ThresholdImageTag "Threshold/Image"
-#define BlackThreshold(pixel,threshold) \
- if (pixel <= threshold) pixel=0;
CacheView
*image_view;
if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
return(MagickFalse);
if (IsGrayColorspace(image->colorspace) != MagickFalse)
- (void) TransformImageColorspace(image,sRGBColorspace,exception);
+ (void) SetImageColorspace(image,sRGBColorspace,exception);
GetPixelInfo(image,&threshold);
flags=ParseGeometry(thresholds,&geometry_info);
threshold.red=geometry_info.rho;
}
if ((flags & PercentValue) != 0)
{
- threshold.red*=(QuantumRange/100.0);
- threshold.green*=(QuantumRange/100.0);
- threshold.blue*=(QuantumRange/100.0);
- threshold.black*=(QuantumRange/100.0);
- threshold.alpha*=(QuantumRange/100.0);
+ threshold.red*=(MagickRealType) (QuantumRange/100.0);
+ threshold.green*=(MagickRealType) (QuantumRange/100.0);
+ threshold.blue*=(MagickRealType) (QuantumRange/100.0);
+ threshold.black*=(MagickRealType) (QuantumRange/100.0);
+ threshold.alpha*=(MagickRealType) (QuantumRange/100.0);
}
/*
White threshold image.
progress=0;
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_number_threads(image->columns,image->rows,1)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- PixelInfo
- pixel;
-
register ssize_t
x;
status=MagickFalse;
continue;
}
- GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelMask(image,q) != 0)
+ double
+ pixel;
+
+ register ssize_t
+ i;
+
+ if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
continue;
}
- GetPixelInfoPixel(image,q,&pixel);
- BlackThreshold(pixel.red,threshold.red);
- BlackThreshold(pixel.green,threshold.green);
- BlackThreshold(pixel.blue,threshold.blue);
- BlackThreshold(pixel.black,threshold.black);
- BlackThreshold(pixel.alpha,threshold.alpha);
- SetPixelInfoPixel(image,&pixel,q);
+ pixel=GetPixelIntensity(image,q);
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ if ((traits & UpdatePixelTrait) == 0)
+ continue;
+ if (image->channel_mask != DefaultChannels)
+ pixel=(double) q[i];
+ if (pixel <= GetPixelInfoChannel(&threshold,channel))
+ q[i]=(Quantum) 0;
+ }
q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% ClampImage() restricts the color range from 0 to the quantum depth.
+% ClampImage() set each pixel whose value is below zero to zero and any the
+% pixel whose value is above the quantum range to the quantum range (e.g.
+% 65535) otherwise the pixel value remains unchanged.
%
% The format of the ClampImage method is:
%
%
*/
-static inline Quantum ClampToUnsignedQuantum(const Quantum quantum)
+static inline Quantum ClampPixel(const MagickRealType value)
{
-#if defined(MAGICKCORE_HDRI_SUPPORT)
- if (quantum <= 0)
- return(0);
- if (quantum >= QuantumRange)
- return(QuantumRange);
- return(quantum);
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ return((Quantum) value);
#else
- return(quantum);
+ if (value < 0.0f)
+ return(0.0);
+ if (value >= (MagickRealType) QuantumRange)
+ return((Quantum) QuantumRange);
+ return(value);
#endif
}
q=image->colormap;
for (i=0; i < (ssize_t) image->colors; i++)
{
- q->red=(double) ClampToUnsignedQuantum(ClampToQuantum(q->red));
- q->green=(double) ClampToUnsignedQuantum(ClampToQuantum(q->green));
- q->blue=(double) ClampToUnsignedQuantum(ClampToQuantum(q->blue));
- q->alpha=(double) ClampToUnsignedQuantum(ClampToQuantum(q->alpha));
+ q->red=(double) ClampPixel(q->red);
+ q->green=(double) ClampPixel(q->green);
+ q->blue=(double) ClampPixel(q->blue);
+ q->alpha=(double) ClampPixel(q->alpha);
q++;
}
return(SyncImage(image,exception));
progress=0;
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_number_threads(image->columns,image->rows,1)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
register ssize_t
i;
- if (GetPixelMask(image,q) != 0)
+ if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
continue;
}
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- traits;
-
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- if (traits == UndefinedPixelTrait)
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ if ((traits & UpdatePixelTrait) == 0)
continue;
- q[i]=ClampToUnsignedQuantum(q[i]);
+ q[i]=ClampPixel(q[i]);
}
q+=GetPixelChannels(image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_ClampImage)
#endif
- proceed=SetImageProgress(image,ClampImageTag,progress++,
- image->rows);
+ proceed=SetImageProgress(image,ClampImageTag,progress++,image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
ThresholdMap
*map;
- map=(ThresholdMap *)NULL;
+ map=GetThresholdMapFile(MinimalThresholdMap,"built-in",map_id,exception);
+ if (map != (ThresholdMap *) NULL)
+ return(map);
options=GetConfigureOptions(ThresholdsFilename,exception);
- while ((option=(const StringInfo *) GetNextValueInLinkedList(options)) !=
- (const StringInfo *) NULL && (map == (ThresholdMap *) NULL))
+ option=(const StringInfo *) GetNextValueInLinkedList(options);
+ while (option != (const StringInfo *) NULL)
+ {
map=GetThresholdMapFile((const char *) GetStringInfoDatum(option),
GetStringInfoPath(option),map_id,exception);
+ if (map != (ThresholdMap *) NULL)
+ break;
+ option=(const StringInfo *) GetNextValueInLinkedList(options);
+ }
options=DestroyConfigureOptions(options);
return(map);
}
% o exception: return any errors or warnings in this structure.
%
*/
-static ThresholdMap *GetThresholdMapFile(const char *xml,
- const char *filename,const char *map_id,ExceptionInfo *exception)
+static ThresholdMap *GetThresholdMapFile(const char *xml,const char *filename,
+ const char *map_id,ExceptionInfo *exception)
{
char
*p;
break;
}
if (threshold == (XMLTreeInfo *) NULL)
- return(map);
+ {
+ thresholds=DestroyXMLTree(thresholds);
+ return(map);
+ }
description=GetXMLTreeChild(threshold,"description");
if (description == (XMLTreeInfo *) NULL)
{
options=GetConfigureOptions(ThresholdsFilename,exception);
(void) FormatLocaleFile(file,
"\n Threshold Maps for Ordered Dither Operations\n");
- while ((option=(const StringInfo *) GetNextValueInLinkedList(options)) !=
- (const StringInfo *) NULL)
+ option=(const StringInfo *) GetNextValueInLinkedList(options);
+ while (option != (const StringInfo *) NULL)
{
- (void) FormatLocaleFile(file,"\nPATH: %s\n\n",GetStringInfoPath(option));
- status|=ListThresholdMapFile(file,(const char *) GetStringInfoDatum(option),
+ (void) FormatLocaleFile(file,"\nPath: %s\n\n",GetStringInfoPath(option));
+ status&=ListThresholdMapFile(file,(const char *) GetStringInfoDatum(option),
GetStringInfoPath(option),exception);
+ option=(const StringInfo *) GetNextValueInLinkedList(options);
}
options=DestroyConfigureOptions(options);
return(status != 0 ? MagickTrue : MagickFalse);
const char
*p;
+ double
+ levels[CompositePixelChannel];
+
MagickBooleanType
status;
MagickOffsetType
progress;
- MagickRealType
- levels[CompositePixelChannel];
-
register ssize_t
i;
progress=0;
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_number_threads(image->columns,image->rows,1)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
n;
n=0;
- if (GetPixelMask(image,q) != 0)
+ if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
continue;
}
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- PixelChannel
- channel;
-
- PixelTrait
- traits;
-
ssize_t
level,
threshold;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
if (fabs(levels[n++]) < MagickEpsilon)
threshold=(ssize_t) (QuantumScale*q[i]*(levels[n]*(map->divisor-1)+1));
level=threshold/(map->divisor-1);
threshold-=level*(map->divisor-1);
- q[i]=RoundToQuantum((MagickRealType) (level+(threshold >=
+ q[i]=ClampToQuantum((double) (level+(threshold >=
map->levels[(x % map->width)+map->width*(y % map->height)]))*
QuantumRange/levels[n]);
n++;
% %
% %
% %
+% P e r c e p t i b l e I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% PerceptibleImage() set each pixel whose value is less than |epsilon| to
+% epsilon or -epsilon (whichever is closer) otherwise the pixel value remains
+% unchanged.
+%
+% The format of the PerceptibleImage method is:
+%
+% MagickBooleanType PerceptibleImage(Image *image,const double epsilon,
+% ExceptionInfo *exception)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o epsilon: the epsilon threshold (e.g. 1.0e-9).
+%
+% o exception: return any errors or warnings in this structure.
+%
+*/
+
+static inline Quantum PerceptibleThreshold(const Quantum quantum,
+ const double epsilon)
+{
+ double
+ sign;
+
+ sign=(double) quantum < 0.0 ? -1.0 : 1.0;
+ if ((sign*quantum) >= epsilon)
+ return(quantum);
+ return((Quantum) (sign*epsilon));
+}
+
+MagickExport MagickBooleanType PerceptibleImage(Image *image,
+ const double epsilon,ExceptionInfo *exception)
+{
+#define PerceptibleImageTag "Perceptible/Image"
+
+ CacheView
+ *image_view;
+
+ MagickBooleanType
+ status;
+
+ MagickOffsetType
+ progress;
+
+ ssize_t
+ y;
+
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ if (image->storage_class == PseudoClass)
+ {
+ register ssize_t
+ i;
+
+ register PixelInfo
+ *restrict q;
+
+ q=image->colormap;
+ for (i=0; i < (ssize_t) image->colors; i++)
+ {
+ q->red=(double) PerceptibleThreshold(ClampToQuantum(q->red),
+ epsilon);
+ q->green=(double) PerceptibleThreshold(ClampToQuantum(q->green),
+ epsilon);
+ q->blue=(double) PerceptibleThreshold(ClampToQuantum(q->blue),
+ epsilon);
+ q->alpha=(double) PerceptibleThreshold(ClampToQuantum(q->alpha),
+ epsilon);
+ q++;
+ }
+ return(SyncImage(image,exception));
+ }
+ /*
+ Perceptible image.
+ */
+ status=MagickTrue;
+ progress=0;
+ image_view=AcquireAuthenticCacheView(image,exception);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,image,image->rows,1)
+#endif
+ for (y=0; y < (ssize_t) image->rows; y++)
+ {
+ register ssize_t
+ x;
+
+ register Quantum
+ *restrict q;
+
+ if (status == MagickFalse)
+ continue;
+ q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ {
+ status=MagickFalse;
+ continue;
+ }
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ register ssize_t
+ i;
+
+ if (GetPixelReadMask(image,q) == 0)
+ {
+ q+=GetPixelChannels(image);
+ continue;
+ }
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ if (traits == UndefinedPixelTrait)
+ continue;
+ q[i]=PerceptibleThreshold(q[i],epsilon);
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
+ status=MagickFalse;
+ if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ {
+ MagickBooleanType
+ proceed;
+
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp critical (MagickCore_PerceptibleImage)
+#endif
+ proceed=SetImageProgress(image,PerceptibleImageTag,progress++,image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
+ }
+ image_view=DestroyCacheView(image_view);
+ return(status);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
% R a n d o m T h r e s h o l d I m a g e %
% %
% %
CacheView
*image_view;
+ double
+ min_threshold,
+ max_threshold;
+
GeometryInfo
geometry_info;
PixelInfo
threshold;
- MagickRealType
- min_threshold,
- max_threshold;
-
RandomInfo
**restrict random_info;
ssize_t
y;
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
unsigned long
key;
+#endif
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
return(MagickFalse);
GetPixelInfo(image,&threshold);
min_threshold=0.0;
- max_threshold=(MagickRealType) QuantumRange;
+ max_threshold=(double) QuantumRange;
flags=ParseGeometry(thresholds,&geometry_info);
min_threshold=geometry_info.rho;
max_threshold=geometry_info.sigma;
max_threshold=min_threshold;
if (strchr(thresholds,'%') != (char *) NULL)
{
- max_threshold*=(MagickRealType) (0.01*QuantumRange);
- min_threshold*=(MagickRealType) (0.01*QuantumRange);
+ max_threshold*=(double) (0.01*QuantumRange);
+ min_threshold*=(double) (0.01*QuantumRange);
}
/*
Random threshold image.
status=MagickTrue;
progress=0;
random_info=AcquireRandomInfoThreadSet();
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
key=GetRandomSecretKey(random_info[0]);
+#endif
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_number_threads(image->columns,image->rows,key == ~0UL)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,image,image->rows,key == ~0UL)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
register ssize_t
i;
- if (GetPixelMask(image,q) != 0)
+ if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
continue;
}
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- MagickRealType
+ double
threshold;
- PixelChannel
- channel;
-
- PixelTrait
- traits;
-
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
- if ((MagickRealType) q[i] < min_threshold)
+ if ((double) q[i] < min_threshold)
threshold=min_threshold;
else
- if ((MagickRealType) q[i] > max_threshold)
+ if ((double) q[i] > max_threshold)
threshold=max_threshold;
else
- threshold=(MagickRealType) (QuantumRange*
+ threshold=(double) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
- q[i]=(Quantum) ((MagickRealType) q[i] <= threshold ? 0 :
- QuantumRange);
+ q[i]=(double) q[i] <= threshold ? 0 : QuantumRange;
}
q+=GetPixelChannels(image);
}
const char *thresholds,ExceptionInfo *exception)
{
#define ThresholdImageTag "Threshold/Image"
-#define WhiteThreshold(pixel,threshold) \
- if (pixel > threshold) pixel=QuantumRange;
CacheView
*image_view;
}
if ((flags & PercentValue) != 0)
{
- threshold.red*=(QuantumRange/100.0);
- threshold.green*=(QuantumRange/100.0);
- threshold.blue*=(QuantumRange/100.0);
- threshold.black*=(QuantumRange/100.0);
- threshold.alpha*=(QuantumRange/100.0);
+ threshold.red*=(MagickRealType) (QuantumRange/100.0);
+ threshold.green*=(MagickRealType) (QuantumRange/100.0);
+ threshold.blue*=(MagickRealType) (QuantumRange/100.0);
+ threshold.black*=(MagickRealType) (QuantumRange/100.0);
+ threshold.alpha*=(MagickRealType) (QuantumRange/100.0);
}
/*
White threshold image.
progress=0;
image_view=AcquireAuthenticCacheView(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,8) shared(progress,status) \
- dynamic_number_threads(image->columns,image->rows,1)
+ #pragma omp parallel for schedule(static,4) shared(progress,status) \
+ magick_threads(image,image,image->rows,1)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- PixelInfo
- pixel;
-
register ssize_t
x;
status=MagickFalse;
continue;
}
- GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelMask(image,q) != 0)
+ double
+ pixel;
+
+ register ssize_t
+ i;
+
+ if (GetPixelReadMask(image,q) == 0)
{
q+=GetPixelChannels(image);
continue;
}
- GetPixelInfoPixel(image,q,&pixel);
- WhiteThreshold(pixel.red,threshold.red);
- WhiteThreshold(pixel.green,threshold.green);
- WhiteThreshold(pixel.blue,threshold.blue);
- WhiteThreshold(pixel.black,threshold.black);
- WhiteThreshold(pixel.alpha,threshold.alpha);
- SetPixelInfoPixel(image,&pixel,q);
+ pixel=GetPixelIntensity(image,q);
+ for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+ {
+ PixelChannel channel=GetPixelChannelChannel(image,i);
+ PixelTrait traits=GetPixelChannelTraits(image,channel);
+ if ((traits & UpdatePixelTrait) == 0)
+ continue;
+ if (image->channel_mask != DefaultChannels)
+ pixel=(double) q[i];
+ if (pixel > GetPixelInfoChannel(&threshold,channel))
+ q[i]=QuantumRange;
+ }
q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
projects / imagemagick / blobdiff