diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 29b6ac4..c7b0b44 100644
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -670,7 +670,7 @@
assert(convolve_image->signature == MagickSignature);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- if ((image->storage_class != DirectClass) ||
+ if ((image->storage_class != DirectClass) ||
(image->colorspace == CMYKColorspace))
return(MagickFalse);
if ((GetImageVirtualPixelMethod(image) != UndefinedVirtualPixelMethod) &&
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index a50aa30..408ae52 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -80,7 +80,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% CompareImages() compares one or more pixel channels of an image to a
+% CompareImages() compares one or more pixel channels of an image to a
% reconstructed image and returns the difference image.
%
% The format of the CompareImages method is:
@@ -283,7 +283,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetImageDistortion() compares one or more pixel channels of an image to a
+% GetImageDistortion() compares one or more pixel channels of an image to a
% reconstructed image and returns the specified distortion metric.
%
% The format of the CompareImages method is:
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 48d9286..7df4bf3 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -383,7 +383,7 @@
/*
Draw sides of ornamental border.
*/
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
dynamic_number_threads(image,image->columns,image->rows,1)
#endif
@@ -485,7 +485,7 @@
MagickBooleanType
proceed;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_FrameImage)
#endif
proceed=SetImageProgress(image,FrameImageTag,progress++,image->rows);
@@ -688,7 +688,7 @@
status=MagickTrue;
progress=0;
image_view=AcquireAuthenticCacheView(image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
dynamic_number_threads(image,image->columns,image->rows,1)
#endif
@@ -876,7 +876,7 @@
status=MagickFalse;
}
}
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static) shared(progress,status) \
dynamic_number_threads(image,image->columns,image->rows,1)
#endif
diff --git a/MagickCore/display.c b/MagickCore/display.c
index 2d6e537..03a13e9 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -10172,7 +10172,7 @@
(DrawInfo *) NULL);
draw_info->fill.alpha=(double) ClampToQuantum(
StringToDouble(matte,(char **) NULL));
- channel_mask=SetImageChannelMask(*image,AlphaChannel);
+ channel_mask=SetImageChannelMask(*image,AlphaChannel);
(void) FloodfillPaintImage(*image,draw_info,&target,(ssize_t)
x_offset,(ssize_t) y_offset,method == FloodfillMethod ?
MagickFalse : MagickTrue,exception);
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index fff798b..5e25515 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -718,15 +718,15 @@
for (i=0; i < (ssize_t) image->colors; i++)
{
/*
- Apply transfer function to colormap.
+ Apply transfer function to colormap.
*/
double
- luma;
+ luma;
luma=0.21267*image->colormap[i].red+0.71526*image->colormap[i].green+
- 0.07217*image->colormap[i].blue;
+ 0.07217*image->colormap[i].blue;
image->colormap[i].red=luma+color_correction.saturation*cdl_map[
- ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red))].red-luma;
+ ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red))].red-luma;
image->colormap[i].green=luma+color_correction.saturation*cdl_map[
ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green))].green-luma;
image->colormap[i].blue=luma+color_correction.saturation*cdl_map[
@@ -1806,10 +1806,10 @@
for (i=0; i < (ssize_t) image->colors; i++)
{
/*
- Gamma-correct colormap.
+ Gamma-correct colormap.
*/
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].red=(double) gamma_map[
+ image->colormap[i].red=(double) gamma_map[
ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red))];
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=(double) gamma_map[
@@ -3058,18 +3058,18 @@
for (i=0; i < (ssize_t) image->colors; i++)
{
/*
- Negate colormap.
+ Negate colormap.
*/
if (grayscale != MagickFalse)
- if ((image->colormap[i].red != image->colormap[i].green) ||
- (image->colormap[i].green != image->colormap[i].blue))
- continue;
+ if ((image->colormap[i].red != image->colormap[i].green) ||
+ (image->colormap[i].green != image->colormap[i].blue))
+ continue;
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].red=QuantumRange-image->colormap[i].red;
+ image->colormap[i].red=QuantumRange-image->colormap[i].red;
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].green=QuantumRange-image->colormap[i].green;
+ image->colormap[i].green=QuantumRange-image->colormap[i].green;
if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].blue=QuantumRange-image->colormap[i].blue;
+ image->colormap[i].blue=QuantumRange-image->colormap[i].blue;
}
/*
Negate image.
@@ -3387,9 +3387,9 @@
Convenience macros.
*/
#define ScaledSig(x) ( ClampToQuantum(QuantumRange* \
- ScaledSigmoidal(contrast,QuantumScale*midpoint,QuantumScale*(x))) )
+ ScaledSigmoidal(contrast,QuantumScale*midpoint,QuantumScale*(x))) )
#define InverseScaledSig(x) ( ClampToQuantum(QuantumRange* \
- InverseScaledSigmoidal(contrast,QuantumScale*midpoint,QuantumScale*(x))) )
+ InverseScaledSigmoidal(contrast,QuantumScale*midpoint,QuantumScale*(x))) )
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
@@ -3401,32 +3401,32 @@
if (image->storage_class == PseudoClass)
{
register ssize_t
- i;
+ i;
if (sharpen != MagickFalse)
for (i=0; i < (ssize_t) image->colors; i++)
{
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].red=ScaledSig(image->colormap[i].red);
- if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].green=ScaledSig(image->colormap[i].green);
- if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].blue=ScaledSig(image->colormap[i].blue);
- if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].alpha=ScaledSig(image->colormap[i].alpha);
- }
+ image->colormap[i].red=ScaledSig(image->colormap[i].red);
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].green=ScaledSig(image->colormap[i].green);
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].blue=ScaledSig(image->colormap[i].blue);
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].alpha=ScaledSig(image->colormap[i].alpha);
+ }
else
for (i=0; i < (ssize_t) image->colors; i++)
- {
- if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].red=InverseScaledSig(image->colormap[i].red);
- if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
+ {
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].red=InverseScaledSig(image->colormap[i].red);
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=InverseScaledSig(image->colormap[i].green);
- if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].blue=InverseScaledSig(image->colormap[i].blue);
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
+ image->colormap[i].blue=InverseScaledSig(image->colormap[i].blue);
if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
- image->colormap[i].alpha=InverseScaledSig(image->colormap[i].alpha);
- }
+ image->colormap[i].alpha=InverseScaledSig(image->colormap[i].alpha);
+ }
}
/*
Sigmoidal-contrast enhance image.
@@ -3457,7 +3457,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
register ssize_t
- i;
+ i;
if (GetPixelMask(image,q) != 0)
{
@@ -3476,10 +3476,10 @@
traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
- if (sharpen != MagickFalse)
- q[i]=ScaledSig(q[i]);
- else
- q[i]=InverseScaledSig(q[i]);
+ if (sharpen != MagickFalse)
+ q[i]=ScaledSig(q[i]);
+ else
+ q[i]=InverseScaledSig(q[i]);
}
q+=GetPixelChannels(image);
}
diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c
index 0505adb..83d0cad 100644
--- a/MagickCore/histogram.c
+++ b/MagickCore/histogram.c
@@ -1157,7 +1157,7 @@
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
(void) QueryColorname(image,&pixel,SVGCompliance,color,exception);
GetColorTuple(&pixel,MagickTrue,hex);
- (void) FormatLocaleFile(file,"%10.20g",(double) ((MagickOffsetType)
+ (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)
diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index d9414bd..95f1f61 100644
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -1087,7 +1087,7 @@
#endif
(void) NTLocateGhostscript(flags,&product_family,&major_version,
&minor_version);
- }
+ }
}
else
is_64_bit_version=NTIs64BitPlatform();
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index fe2e30d..f98e8aa 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -2742,7 +2742,7 @@
{
if ((image->columns*image->rows) <= maximum_colors)
(void) DirectToColormapImage(image,exception);
- if (IsImageGray(image,exception) != MagickFalse)
+ if (IsImageGray(image,exception) != MagickFalse)
(void) SetGrayscaleImage(image,exception);
}
if ((image->storage_class == PseudoClass) &&
@@ -3346,8 +3346,7 @@
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)
diff --git a/MagickCore/resample.c b/MagickCore/resample.c
index 45d8a59..441ec2f 100644
--- a/MagickCore/resample.c
+++ b/MagickCore/resample.c
@@ -703,16 +703,10 @@
%
% Reference: http://en.wikipedia.org/wiki/Ellipse#Canonical_form
*/
-static inline void ClampUpAxes(const double dux,
- const double dvx,
- const double duy,
- const double dvy,
- double *major_mag,
- double *minor_mag,
- double *major_unit_x,
- double *major_unit_y,
- double *minor_unit_x,
- double *minor_unit_y)
+static inline void ClampUpAxes(const double dux,const double dvx,
+ const double duy,const double dvy,double *major_mag,double *minor_mag,
+ double *major_unit_x,double *major_unit_y,double *minor_unit_x,
+ double *minor_unit_y)
{
/*
* ClampUpAxes takes an input 2x2 matrix
