summaryrefslogtreecommitdiff
path: root/MagickCore/visual-effects.c
diff options
context:
space:
mode:
Diffstat (limited to 'MagickCore/visual-effects.c')
-rw-r--r--MagickCore/visual-effects.c188
1 files changed, 94 insertions, 94 deletions
diff --git a/MagickCore/visual-effects.c b/MagickCore/visual-effects.c
index e8b13aaec..af8ce735e 100644
--- a/MagickCore/visual-effects.c
+++ b/MagickCore/visual-effects.c
@@ -24,7 +24,7 @@
% %
% %
% %
-% Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2021 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 %
@@ -206,13 +206,13 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type,
MagickBooleanType
sync;
- register const Quantum
+ const Quantum
*magick_restrict p;
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict q;
if (status == MagickFalse)
@@ -227,7 +227,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type,
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- register ssize_t
+ ssize_t
i;
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
@@ -363,13 +363,13 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor,
Quantum
quantum;
- register const Quantum
+ const Quantum
*magick_restrict p;
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict q;
if (status == MagickFalse)
@@ -622,10 +622,10 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
MagickBooleanType
sync;
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
if (status == MagickFalse)
@@ -639,7 +639,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
}
for (x=0; x < (ssize_t) colorize_image->columns; x++)
{
- register ssize_t
+ ssize_t
i;
for (i=0; i < (ssize_t) GetPixelChannels(colorize_image); i++)
@@ -747,7 +747,7 @@ MagickExport Image *ColorMatrixImage(const Image *image,
MagickOffsetType
progress;
- register ssize_t
+ ssize_t
i;
ssize_t
@@ -823,13 +823,13 @@ MagickExport Image *ColorMatrixImage(const Image *image,
PixelInfo
pixel;
- register const Quantum
+ const Quantum
*magick_restrict p;
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
if (status == MagickFalse)
@@ -845,7 +845,7 @@ MagickExport Image *ColorMatrixImage(const Image *image,
GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
- register ssize_t
+ ssize_t
v;
size_t
@@ -1032,13 +1032,13 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
PointInfo
delta;
- register const Quantum
+ const Quantum
*magick_restrict p;
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict q;
if (status == MagickFalse)
@@ -1055,7 +1055,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
delta.y=scale.y*(double) (y-center.y);
for (x=0; x < (ssize_t) canvas_image->columns; x++)
{
- register ssize_t
+ ssize_t
i;
/*
@@ -1170,10 +1170,10 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames,
MagickOffsetType
scene;
- register const Image
+ const Image
*next;
- register ssize_t
+ ssize_t
n;
ssize_t
@@ -1268,13 +1268,13 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames,
MagickBooleanType
sync;
- register const Quantum
+ const Quantum
*magick_restrict p;
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict q;
if (status == MagickFalse)
@@ -1290,7 +1290,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames,
}
for (x=0; x < (ssize_t) morph_images->columns; x++)
{
- register ssize_t
+ ssize_t
i;
for (i=0; i < (ssize_t) GetPixelChannels(morph_image); i++)
@@ -1408,14 +1408,14 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
MagickStatusType
status;
- register const Quantum
+ const Quantum
*magick_restrict u,
*magick_restrict v;
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
i;
ssize_t
@@ -1437,8 +1437,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
*/
depth--;
attenuate++;
- x_mid=(ssize_t) ceil((segment->x1+segment->x2)/2-0.5);
- y_mid=(ssize_t) ceil((segment->y1+segment->y2)/2-0.5);
+ x_mid=CastDoubleToLong(ceil((segment->x1+segment->x2)/2-0.5));
+ y_mid=CastDoubleToLong(ceil((segment->y1+segment->y2)/2-0.5));
local_info=(*segment);
local_info.x2=(double) x_mid;
local_info.y2=(double) y_mid;
@@ -1461,8 +1461,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
&local_info,attenuate,depth,exception);
return(status == 0 ? MagickFalse : MagickTrue);
}
- x_mid=(ssize_t) ceil((segment->x1+segment->x2)/2-0.5);
- y_mid=(ssize_t) ceil((segment->y1+segment->y2)/2-0.5);
+ x_mid=CastDoubleToLong(ceil((segment->x1+segment->x2)/2-0.5));
+ y_mid=CastDoubleToLong(ceil((segment->y1+segment->y2)/2-0.5));
if ((fabs(segment->x1-x_mid) < MagickEpsilon) &&
(fabs(segment->x2-x_mid) < MagickEpsilon) &&
(fabs(segment->y1-y_mid) < MagickEpsilon) &&
@@ -1479,11 +1479,11 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
/*
Left pixel.
*/
- x=(ssize_t) ceil(segment->x1-0.5);
- u=GetCacheViewVirtualPixels(u_view,x,(ssize_t) ceil(segment->y1-0.5),1,1,
- exception);
- v=GetCacheViewVirtualPixels(v_view,x,(ssize_t) ceil(segment->y2-0.5),1,1,
- exception);
+ x=CastDoubleToLong(ceil(segment->x1-0.5));
+ u=GetCacheViewVirtualPixels(u_view,x,CastDoubleToLong(ceil(
+ segment->y1-0.5)),1,1,exception);
+ v=GetCacheViewVirtualPixels(v_view,x,CastDoubleToLong(ceil(
+ segment->y2-0.5)),1,1,exception);
q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
if ((u == (const Quantum *) NULL) || (v == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
@@ -1502,11 +1502,11 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
/*
Right pixel.
*/
- x=(ssize_t) ceil(segment->x2-0.5);
- u=GetCacheViewVirtualPixels(u_view,x,(ssize_t) ceil(segment->y1-0.5),
- 1,1,exception);
- v=GetCacheViewVirtualPixels(v_view,x,(ssize_t) ceil(segment->y2-0.5),
- 1,1,exception);
+ x=CastDoubleToLong(ceil(segment->x2-0.5));
+ u=GetCacheViewVirtualPixels(u_view,x,CastDoubleToLong(ceil(
+ segment->y1-0.5)),1,1,exception);
+ v=GetCacheViewVirtualPixels(v_view,x,CastDoubleToLong(ceil(
+ segment->y2-0.5)),1,1,exception);
q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
if ((u == (const Quantum *) NULL) || (v == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
@@ -1531,11 +1531,11 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
/*
Bottom pixel.
*/
- y=(ssize_t) ceil(segment->y2-0.5);
- u=GetCacheViewVirtualPixels(u_view,(ssize_t) ceil(segment->x1-0.5),y,
- 1,1,exception);
- v=GetCacheViewVirtualPixels(v_view,(ssize_t) ceil(segment->x2-0.5),y,
- 1,1,exception);
+ y=CastDoubleToLong(ceil(segment->y2-0.5));
+ u=GetCacheViewVirtualPixels(u_view,CastDoubleToLong(ceil(
+ segment->x1-0.5)),y,1,1,exception);
+ v=GetCacheViewVirtualPixels(v_view,CastDoubleToLong(ceil(
+ segment->x2-0.5)),y,1,1,exception);
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
if ((u == (const Quantum *) NULL) || (v == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
@@ -1555,11 +1555,11 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
/*
Top pixel.
*/
- y=(ssize_t) ceil(segment->y1-0.5);
- u=GetCacheViewVirtualPixels(u_view,(ssize_t) ceil(segment->x1-0.5),y,
- 1,1,exception);
- v=GetCacheViewVirtualPixels(v_view,(ssize_t) ceil(segment->x2-0.5),y,
- 1,1,exception);
+ y=CastDoubleToLong(ceil(segment->y1-0.5));
+ u=GetCacheViewVirtualPixels(u_view,CastDoubleToLong(ceil(
+ segment->x1-0.5)),y,1,1,exception);
+ v=GetCacheViewVirtualPixels(v_view,CastDoubleToLong(ceil(
+ segment->x2-0.5)),y,1,1,exception);
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
if ((u == (const Quantum *) NULL) || (v == (const Quantum *) NULL) ||
(q == (Quantum *) NULL))
@@ -1581,11 +1581,11 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view,
/*
Middle pixel.
*/
- x=(ssize_t) ceil(segment->x1-0.5);
- y=(ssize_t) ceil(segment->y1-0.5);
+ x=CastDoubleToLong(ceil(segment->x1-0.5));
+ y=CastDoubleToLong(ceil(segment->y1-0.5));
u=GetCacheViewVirtualPixels(u_view,x,y,1,1,exception);
- x=(ssize_t) ceil(segment->x2-0.5);
- y=(ssize_t) ceil(segment->y2-0.5);
+ x=CastDoubleToLong(ceil(segment->x2-0.5));
+ y=CastDoubleToLong(ceil(segment->y2-0.5));
v=GetCacheViewVirtualPixels(v_view,x,y,1,1,exception);
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y_mid,1,1,exception);
if ((u == (const Quantum *) NULL) || (v == (const Quantum *) NULL) ||
@@ -1916,13 +1916,13 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold,
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const Quantum
+ const Quantum
*magick_restrict p;
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict q;
if (status == MagickFalse)
@@ -2082,10 +2082,10 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha,
image_view=AcquireAuthenticCacheView(border_image,exception);
for (y=0; y < (ssize_t) border_image->rows; y++)
{
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
if (status == MagickFalse)
@@ -2213,10 +2213,10 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
const int
id = GetOpenMPThreadId();
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
if (status == MagickFalse)
@@ -2233,7 +2233,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
double
value;
- register ssize_t
+ ssize_t
i;
value=GetPseudoRandomValue(random_info[id]);
@@ -2351,7 +2351,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
(void) SetImageColorspace(image,sRGBColorspace,exception);
if (image->storage_class == PseudoClass)
{
- register ssize_t
+ ssize_t
i;
/*
@@ -2380,10 +2380,10 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict q;
if (status == MagickFalse)
@@ -2396,7 +2396,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- register ssize_t
+ ssize_t
i;
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
@@ -2483,10 +2483,10 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark,
PixelInfo
pixel;
- register Quantum
+ Quantum
*q;
- register ssize_t
+ ssize_t
x;
size_t
@@ -2696,14 +2696,14 @@ MagickExport Image *StereoAnaglyphImage(const Image *left_image,
status=MagickTrue;
for (y=0; y < (ssize_t) stereo_image->rows; y++)
{
- register const Quantum
+ const Quantum
*magick_restrict p,
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict r;
p=GetVirtualPixels(left_image,-x_offset,y-y_offset,image->columns,1,
@@ -2864,13 +2864,13 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
PointInfo
delta;
- register const Quantum
+ const Quantum
*magick_restrict p;
- register ssize_t
+ ssize_t
x;
- register Quantum
+ Quantum
*magick_restrict q;
if (status == MagickFalse)
@@ -2894,7 +2894,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
distance=delta.x*delta.x+delta.y*delta.y;
if (distance >= (radius*radius))
{
- register ssize_t
+ ssize_t
i;
for (i=0; i < (ssize_t) GetPixelChannels(canvas_image); i++)
@@ -3086,13 +3086,13 @@ MagickExport Image *TintImage(const Image *image,const char *blend,
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const Quantum
+ const Quantum
*magick_restrict p;
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
if (status == MagickFalse)
@@ -3311,7 +3311,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
MagickOffsetType
progress;
- register ssize_t
+ ssize_t
i;
ssize_t
@@ -3374,13 +3374,13 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
#endif
for (y=0; y < (ssize_t) wave_image->rows; y++)
{
- register const Quantum
+ const Quantum
*magick_restrict p;
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
if (status == MagickFalse)
@@ -3472,7 +3472,7 @@ static inline void HatTransform(const float *magick_restrict pixels,
*magick_restrict q,
*magick_restrict r;
- register ssize_t
+ ssize_t
i;
p=pixels;
@@ -3574,7 +3574,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
noise_view=AcquireAuthenticCacheView(noise_image,exception);
for (channel=0; channel < (ssize_t) GetPixelChannels(image); channel++)
{
- register ssize_t
+ ssize_t
i;
size_t
@@ -3607,7 +3607,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
i=0;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const Quantum
+ const Quantum
*magick_restrict p;
ssize_t
@@ -3650,11 +3650,11 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
const int
id = GetOpenMPThreadId();
- register float
+ float
*magick_restrict p,
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
p=kernel+id*image->columns;
@@ -3673,11 +3673,11 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
const int
id = GetOpenMPThreadId();
- register float
+ float
*magick_restrict p,
*magick_restrict q;
- register ssize_t
+ ssize_t
y;
p=kernel+id*image->rows;
@@ -3718,10 +3718,10 @@ MagickExport Image *WaveletDenoiseImage(const Image *image,
MagickBooleanType
sync;
- register Quantum
+ Quantum
*magick_restrict q;
- register ssize_t
+ ssize_t
x;
ssize_t
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 15:15:57 +0000