From aeded788d060ce7a478d88f6fd250732415e8bb9 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 11 Sep 2012 23:39:36 +0000 Subject: [PATCH] --- MagickCore/accelerate.c | 2 +- MagickCore/compare.c | 4 +-- MagickCore/decorate.c | 8 ++--- MagickCore/display.c | 2 +- MagickCore/enhance.c | 74 ++++++++++++++++++++--------------------- MagickCore/histogram.c | 2 +- MagickCore/nt-base.c | 2 +- MagickCore/quantize.c | 5 ++- MagickCore/resample.c | 14 +++----- 9 files changed, 53 insertions(+), 60 deletions(-) diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index 29b6ac4f9..c7b0b44c3 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -670,7 +670,7 @@ MagickExport MagickBooleanType AccelerateConvolveImage(const Image *image, 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 a50aa30c0..408ae529e 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 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% 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 48d9286ff..7df4bf34e 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -383,7 +383,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, /* 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 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, 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 @@ MagickExport MagickBooleanType RaiseImage(Image *image, 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 @@ MagickExport MagickBooleanType RaiseImage(Image *image, 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 2d6e537e3..03a13e9c7 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -10172,7 +10172,7 @@ static MagickBooleanType XMatteEditImage(Display *display, (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 fff798b62..5e2551536 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -718,15 +718,15 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, 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 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, 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 @@ MagickExport MagickBooleanType NegateImage(Image *image, 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 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, 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 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, 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 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, for (x=0; x < (ssize_t) image->columns; x++) { register ssize_t - i; + i; if (GetPixelMask(image,q) != 0) { @@ -3476,10 +3476,10 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, 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 0505adbcc..83d0cad6e 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -1157,7 +1157,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, (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 d9414bd76..95f1f610e 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -1087,7 +1087,7 @@ static int NTGhostscriptGetString(const char *name,BOOL *is_64_bit,char *value, #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 fe2e30d6c..f98e8aaa2 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -2742,7 +2742,7 @@ MagickExport MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info, { 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 @@ static MagickBooleanType SetGrayscaleImage(Image *image, 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 45d8a5999..441ec2f2c 100644 --- a/MagickCore/resample.c +++ b/MagickCore/resample.c @@ -703,16 +703,10 @@ MagickExport MagickBooleanType ResamplePixelColor( % % 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 -- 2.50.1