From 803640d20a6a664315eddfff6f8531d0c5e0871d Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 17 Nov 2011 02:11:32 +0000 Subject: [PATCH] --- Magick++/lib/Image.cpp | 2 +- MagickCore/attribute.c | 8 +- MagickCore/cache.c | 6 +- MagickCore/color.c | 4 +- MagickCore/colormap.c | 4 +- MagickCore/colorspace.c | 8 +- MagickCore/compare.c | 4 +- MagickCore/composite.c | 4 +- MagickCore/compress.c | 2 +- MagickCore/decorate.c | 66 ++++---- MagickCore/display.c | 2 +- MagickCore/distort.c | 8 +- MagickCore/draw.c | 16 +- MagickCore/histogram.c | 6 +- MagickCore/identify.c | 2 +- MagickCore/image.c | 12 +- MagickCore/layer.c | 16 +- MagickCore/magick-config.h | 50 ++++-- MagickCore/morphology.c | 16 +- MagickCore/paint.c | 12 +- MagickCore/pixel-accessor.h | 316 +++++++++++++++++++----------------- MagickCore/pixel-private.h | 2 +- MagickCore/pixel.c | 6 +- MagickCore/quantum-import.c | 40 ++--- MagickCore/resample.c | 2 +- MagickCore/shear.c | 44 ++--- MagickCore/version.h | 2 +- MagickCore/xwindow.c | 4 +- MagickWand/pixel-wand.c | 6 +- MagickWand/pixel-wand.h | 2 +- coders/debug.c | 2 +- coders/gif.c | 2 +- coders/jbig.c | 2 +- coders/jpeg.c | 4 +- coders/map.c | 2 +- coders/miff.c | 6 +- coders/null.c | 2 +- coders/palm.c | 2 +- coders/png.c | 2 +- coders/psd.c | 4 +- coders/svg.c | 2 +- coders/ttf.c | 2 +- coders/txt.c | 2 +- coders/wpg.c | 26 +-- coders/xc.c | 4 +- coders/xpm.c | 2 +- coders/xwd.c | 2 +- 47 files changed, 391 insertions(+), 349 deletions(-) diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index a9ebc5b1e..ef44e139c 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -3553,7 +3553,7 @@ void Magick::Image::pixelColor ( const ssize_t x_, const ssize_t y_, // Set pixel value Quantum *pixel = pixels.get(x_, y_, 1, 1 ); PixelInfo packet = color_; - MagickCore::SetPixelPixelInfo(constImage(),&packet,pixel); + MagickCore::SetPixelInfoPixel(constImage(),&packet,pixel); // Tell ImageMagick that pixels have been updated pixels.sync(); diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 168d42dc9..fc2771af8 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -156,15 +156,15 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, image_view=DestroyCacheView(image_view); return(bounds); } - SetPixelInfo(image,p,&target[0]); + GetPixelInfoPixel(image,p,&target[0]); GetPixelInfo(image,&target[1]); p=GetCacheViewVirtualPixels(image_view,(ssize_t) image->columns-1,0,1,1, exception); - SetPixelInfo(image,p,&target[1]); + GetPixelInfoPixel(image,p,&target[1]); GetPixelInfo(image,&target[2]); p=GetCacheViewVirtualPixels(image_view,0,(ssize_t) image->rows-1,1,1, exception); - SetPixelInfo(image,p,&target[2]); + GetPixelInfoPixel(image,p,&target[2]); status=MagickTrue; GetPixelInfo(image,&zero); #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -199,7 +199,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, pixel=zero; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); if ((x < bounding_box.x) && (IsFuzzyEquivalencePixelInfo(&pixel,&target[0]) == MagickFalse)) bounding_box.x=x; diff --git a/MagickCore/cache.c b/MagickCore/cache.c index f5b23fcfa..064732677 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -2295,7 +2295,7 @@ MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image, GetPixelInfo(image,pixel); if (p == (const Quantum *) NULL) return(MagickFalse); - SetPixelInfo(image,p,pixel); + GetPixelInfoPixel(image,p,pixel); return(MagickTrue); } @@ -3864,8 +3864,8 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info, { if ((p == (const Quantum *) NULL) || (r == (const Quantum *) NULL)) break; - SetPixelInfo(image,p,&alpha); - SetPixelInfo(image,q,&beta); + GetPixelInfoPixel(image,p,&alpha); + GetPixelInfoPixel(image,q,&beta); MagickPixelCompositeMask(&beta,(MagickRealType) GetPixelIntensity(image,r), &alpha,alpha.alpha,&beta); SetPixelRed(image,ClampToQuantum(beta.red),q); diff --git a/MagickCore/color.c b/MagickCore/color.c index 9760f8ec0..34b884ca0 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -1662,9 +1662,9 @@ MagickExport MagickBooleanType IsEquivalentImage(const Image *image, for (i=0; i < (ssize_t) target_image->columns; i++) { p=GetCacheViewVirtualPixels(image_view,x+i,y+j,1,1,exception); - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); q=GetCacheViewVirtualPixels(target_view,i,j,1,1,exception); - SetPixelInfo(image,q,&target); + GetPixelInfoPixel(image,q,&target); if (IsFuzzyEquivalencePixelInfo(&pixel,&target) == MagickFalse) break; } diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index db7c7214b..2e577b4af 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -225,7 +225,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, if (index < 0) index+=(ssize_t) image->colors; SetPixelIndex(image,(Quantum) index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -362,7 +362,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, { index=(Quantum) pixels[(ssize_t) GetPixelIndex(image,q)]; SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index f4aa655c1..6aaf516c5 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -330,9 +330,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, pixel=zero; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,q,&pixel); + GetPixelInfoPixel(image,q,&pixel); ConvertRGBToCMYK(&pixel); - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); q+=GetPixelChannels(image); } sync=SyncCacheViewAuthenticPixels(image_view,exception); @@ -1759,9 +1759,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, pixel=zero; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,q,&pixel); + GetPixelInfoPixel(image,q,&pixel); ConvertCMYKToRGB(&pixel); - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); q+=GetPixelChannels(image); } sync=SyncCacheViewAuthenticPixels(image_view,exception); diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 4b5bd0fa1..e380b1ed6 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -245,9 +245,9 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, difference=MagickTrue; } if (difference == MagickFalse) - SetPixelPixelInfo(highlight_image,&lowlight,r); + SetPixelInfoPixel(highlight_image,&lowlight,r); else - SetPixelPixelInfo(highlight_image,&highlight,r); + SetPixelInfoPixel(highlight_image,&highlight,r); p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); r+=GetPixelChannels(highlight_image); diff --git a/MagickCore/composite.c b/MagickCore/composite.c index f54ad4e56..c99afb631 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -1855,7 +1855,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, GetPixelGreen(composite_image,p)); (void) ResamplePixelColor(resample_filter,(double) x_offset+x, (double) y_offset+y,&pixel); - SetPixelPixelInfo(destination_image,&pixel,q); + SetPixelInfoPixel(destination_image,&pixel,q); p+=GetPixelChannels(composite_image); q+=GetPixelChannels(destination_image); } @@ -2027,7 +2027,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, pixel.alpha=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale* pixel.alpha)*(1.0-QuantumScale* GetPixelAlpha(composite_image,p))); - SetPixelPixelInfo(destination_image,&pixel,q); + SetPixelInfoPixel(destination_image,&pixel,q); p+=GetPixelChannels(composite_image); q+=GetPixelChannels(destination_image); } diff --git a/MagickCore/compress.c b/MagickCore/compress.c index 39ef70c0a..9c48be3a5 100644 --- a/MagickCore/compress.c +++ b/MagickCore/compress.c @@ -635,7 +635,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image, { index=(Quantum) (*p++); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 4771b9ea0..0514d4040 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -303,14 +303,14 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, for (x=0; x < (ssize_t) (frame_image->columns-y); x++) { if (x < y) - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); else - SetPixelPixelInfo(frame_image,&accentuate,q); + SetPixelInfoPixel(frame_image,&accentuate,q); q+=GetPixelChannels(frame_image); } for ( ; x < (ssize_t) frame_image->columns; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } } @@ -318,18 +318,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, { for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } width=frame_image->columns-2*frame_info->outer_bevel; for (x=0; x < (ssize_t) width; x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } } @@ -337,12 +337,12 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, { for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } width=image->columns+((size_t) frame_info->inner_bevel << 1)- @@ -350,25 +350,25 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, for (x=0; x < (ssize_t) width; x++) { if (x < y) - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); else - SetPixelPixelInfo(frame_image,&trough,q); + SetPixelInfoPixel(frame_image,&trough,q); q+=GetPixelChannels(frame_image); } for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } width=frame_info->width-frame_info->x-image->columns-bevel_width; for (x=0; x < (ssize_t) width; x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } } @@ -403,17 +403,17 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, } for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) frame_info->inner_bevel; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } /* @@ -423,7 +423,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, (image->matte != MagickFalse))) for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPixelInfo(frame_image,&interior,q); + SetPixelInfoPixel(frame_image,&interior,q); q+=GetPixelChannels(frame_image); } else @@ -455,18 +455,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, } for (x=0; x < (ssize_t) frame_info->inner_bevel; x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } width=frame_info->width-frame_info->x-image->columns-bevel_width; for (x=0; x < (ssize_t) width; x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } if (SyncCacheViewAuthenticPixels(frame_view,exception) == MagickFalse) @@ -508,36 +508,36 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, { for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } for (x=0; x < y; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++) { if (x >= (ssize_t) (image->columns+2*frame_info->inner_bevel-y)) - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); else - SetPixelPixelInfo(frame_image,&accentuate,q); + SetPixelInfoPixel(frame_image,&accentuate,q); q+=GetPixelChannels(frame_image); } width=frame_info->width-frame_info->x-image->columns-bevel_width; for (x=0; x < (ssize_t) width; x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } } @@ -546,18 +546,18 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, { for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } width=frame_image->columns-2*frame_info->outer_bevel; for (x=0; x < (ssize_t) width; x++) { - SetPixelPixelInfo(frame_image,&matte,q); + SetPixelInfoPixel(frame_image,&matte,q); q+=GetPixelChannels(frame_image); } for (x=0; x < (ssize_t) frame_info->outer_bevel; x++) { - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); q+=GetPixelChannels(frame_image); } } @@ -565,15 +565,15 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, { for (x=0; x < y; x++) { - SetPixelPixelInfo(frame_image,&highlight,q); + SetPixelInfoPixel(frame_image,&highlight,q); q+=GetPixelChannels(frame_image); } for ( ; x < (ssize_t) frame_image->columns; x++) { if (x >= (ssize_t) (frame_image->columns-y)) - SetPixelPixelInfo(frame_image,&shadow,q); + SetPixelInfoPixel(frame_image,&shadow,q); else - SetPixelPixelInfo(frame_image,&trough,q); + SetPixelInfoPixel(frame_image,&trough,q); q+=GetPixelChannels(frame_image); } } diff --git a/MagickCore/display.c b/MagickCore/display.c index c924544e9..94d41aeeb 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -13295,7 +13295,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, break; for (j=0; j < (int) width; j++) { - SetPixelPixelInfo(image,&pixel,s); + SetPixelInfoPixel(image,&pixel,s); s+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/distort.c b/MagickCore/distort.c index 2c24a8beb..326e3c6da 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2648,7 +2648,7 @@ if ( d.x == 0.5 && d.y == 0.5 ) { if ( validity <= 0.0 ) { /* result of distortion is an invalid pixel - don't resample */ - SetPixelPixelInfo(distort_image,&invalid,q); + SetPixelInfoPixel(distort_image,&invalid,q); } else { /* resample the source image to find its correct color */ @@ -2660,7 +2660,7 @@ if ( d.x == 0.5 && d.y == 0.5 ) { CompositePixelInfoBlend(&pixel,validity,&invalid,(1.0-validity), &pixel); } - SetPixelPixelInfo(distort_image,&pixel,q); + SetPixelInfoPixel(distort_image,&pixel,q); } q+=GetPixelChannels(distort_image); } @@ -2921,7 +2921,7 @@ MagickExport Image *SparseColorImage(const Image *image, GetPixelInfo(sparse_image,&pixel); for (i=0; i < (ssize_t) image->columns; i++) { - SetPixelInfo(image,q,&pixel); + GetPixelInfoPixel(image,q,&pixel); switch (sparse_method) { case BarycentricColorInterpolate: @@ -3070,7 +3070,7 @@ MagickExport Image *SparseColorImage(const Image *image, if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) && (image->matte != MagickFalse)) pixel.alpha*=QuantumRange; - SetPixelPixelInfo(sparse_image,&pixel,q); + SetPixelInfoPixel(sparse_image,&pixel,q); q+=GetPixelChannels(sparse_image); } sync=SyncCacheViewAuthenticPixels(sparse_view,exception); diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 99a34ec1a..54ab11da6 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1198,10 +1198,10 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, inverse_affine.ty; (void) InterpolatePixelInfo(source,source_view,UndefinedInterpolatePixel, point.x,point.y,&pixel,exception); - SetPixelInfo(image,q,&composite); + GetPixelInfoPixel(image,q,&composite); CompositePixelInfoOver(&pixel,pixel.alpha,&composite,composite.alpha, &composite); - SetPixelPixelInfo(image,&composite,q); + SetPixelInfoPixel(image,&composite,q); x_offset++; q+=GetPixelChannels(image); } @@ -3280,7 +3280,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, offset/=length; for (x=bounding_box.x; x < (ssize_t) bounding_box.width; x++) { - SetPixelInfo(image,q,&pixel); + GetPixelInfoPixel(image,q,&pixel); switch (gradient->spread) { case UndefinedSpread: @@ -3414,7 +3414,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, } CompositePixelInfoOver(&composite,composite.alpha,&pixel,pixel.alpha, &pixel); - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -3883,7 +3883,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, (y == (ssize_t) ceil(primitive_info->point.y-0.5))) { (void) GetStrokeColor(draw_info,x,y,&pixel,exception); - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); } q+=GetPixelChannels(image); } @@ -4169,7 +4169,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, break; GetPixelInfo(image,&pixel); (void) GetFillColor(draw_info,x,y,&pixel,exception); - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); (void) SyncCacheViewAuthenticPixels(image_view,exception); break; } @@ -4209,7 +4209,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, continue; } (void) GetFillColor(draw_info,x,y,&pixel,exception); - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); q+=GetPixelChannels(image); } sync=SyncCacheViewAuthenticPixels(image_view,exception); @@ -4261,7 +4261,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, for (x=0; x < (ssize_t) image->columns; x++) { (void) GetFillColor(draw_info,x,y,&pixel,exception); - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); q+=GetPixelChannels(image); } sync=SyncCacheViewAuthenticPixels(image_view,exception); diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index 816268bdb..269c13d47 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -239,7 +239,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, 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) { @@ -705,7 +705,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, 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) { @@ -865,7 +865,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, 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) { diff --git a/MagickCore/identify.c b/MagickCore/identify.c index ea5a3a930..1cffefe20 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -604,7 +604,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, pixel; GetPixelInfo(image,&pixel); - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); (void) QueryColorname(image,&pixel,SVGCompliance,tuple, exception); (void) FormatLocaleFile(file," Alpha: %s ",tuple); diff --git a/MagickCore/image.c b/MagickCore/image.c index 6ec59fa2a..69317a8fd 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -2073,7 +2073,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info, } for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPixelInfo(image,background,q); + SetPixelInfoPixel(image,background,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -2467,7 +2467,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, for (x=0; x < (ssize_t) image->columns; x++) { if (GetPixelAlpha(image,q) == TransparentAlpha) - SetPixelPixelInfo(image,&background,q); + SetPixelInfoPixel(image,&background,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -2597,7 +2597,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image, if (image->background_color.alpha != OpaqueAlpha) image->matte=MagickTrue; background=image->background_color; - SetPacketPixelInfo(image,&background,&pixel); + SetPixelInfo(image,&background,&pixel); /* Set image background color. */ @@ -2622,7 +2622,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPixelInfo(image,&background,q); + SetPixelInfoPixel(image,&background,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -2703,7 +2703,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image, } for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPixelInfo(image,color,q); + SetPixelInfoPixel(image,color,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -4033,7 +4033,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) { index=PushColormapIndex(image,(size_t) GetPixelIndex(image,q), &range_exception); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/layer.c b/MagickCore/layer.c index 637158967..b9b6603f5 100644 --- a/MagickCore/layer.c +++ b/MagickCore/layer.c @@ -626,8 +626,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2 break; for (y=0; y < (ssize_t) image1->rows; y++) { - SetPixelInfo(image1,p,&pixel1); - SetPixelInfo(image2,q,&pixel2); + GetPixelInfoPixel(image1,p,&pixel1); + GetPixelInfoPixel(image2,q,&pixel2); if (ComparePixels(method,&pixel1,&pixel2)) break; p+=GetPixelChannels(image1); @@ -657,8 +657,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2 break; for (y=0; y < (ssize_t) image1->rows; y++) { - SetPixelInfo(image1,p,&pixel1); - SetPixelInfo(image2,q,&pixel2); + GetPixelInfoPixel(image1,p,&pixel1); + GetPixelInfoPixel(image2,q,&pixel2); if (ComparePixels(method,&pixel1,&pixel2)) break; p+=GetPixelChannels(image1); @@ -677,8 +677,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2 break; for (x=0; x < (ssize_t) image1->columns; x++) { - SetPixelInfo(image1,p,&pixel1); - SetPixelInfo(image2,q,&pixel2); + GetPixelInfoPixel(image1,p,&pixel1); + GetPixelInfoPixel(image2,q,&pixel2); if (ComparePixels(method,&pixel1,&pixel2)) break; p+=GetPixelChannels(image1); @@ -697,8 +697,8 @@ static RectangleInfo CompareImagesBounds(const Image *image1,const Image *image2 break; for (x=0; x < (ssize_t) image1->columns; x++) { - SetPixelInfo(image1,p,&pixel1); - SetPixelInfo(image2,q,&pixel2); + GetPixelInfoPixel(image1,p,&pixel1); + GetPixelInfoPixel(image2,q,&pixel2); if (ComparePixels(method,&pixel1,&pixel2)) break; p+=GetPixelChannels(image1); diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 9df57932b..1d5e0df2d 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,7 +12,9 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -/* #undef BUILD_MODULES */ +#ifndef MAGICKCORE_BUILD_MODULES +#define MAGICKCORE_BUILD_MODULES 1 +#endif /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -75,7 +77,9 @@ #endif /* Define if you have FFTW library */ -/* #undef FFTW_DELEGATE */ +#ifndef MAGICKCORE_FFTW_DELEGATE +#define MAGICKCORE_FFTW_DELEGATE 1 +#endif /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH @@ -217,7 +221,9 @@ #endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_CL_CL_H */ +#ifndef MAGICKCORE_HAVE_CL_CL_H +#define MAGICKCORE_HAVE_CL_CL_H 1 +#endif /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -440,15 +446,15 @@ #endif /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS2_H -#define MAGICKCORE_HAVE_LCMS2_H 1 -#endif +/* #undef HAVE_LCMS2_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ /* Define if you have the header file. */ -/* #undef HAVE_LCMS_H */ +#ifndef MAGICKCORE_HAVE_LCMS_H +#define MAGICKCORE_HAVE_LCMS_H 1 +#endif /* Define if you have the header file. */ /* #undef HAVE_LCMS_LCMS_H */ @@ -1186,7 +1192,9 @@ #endif /* Define if you have JBIG library */ -/* #undef JBIG_DELEGATE */ +#ifndef MAGICKCORE_JBIG_DELEGATE +#define MAGICKCORE_JBIG_DELEGATE 1 +#endif /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1215,7 +1223,9 @@ #endif /* Define if you have LQR library */ -/* #undef LQR_DELEGATE */ +#ifndef MAGICKCORE_LQR_DELEGATE +#define MAGICKCORE_LQR_DELEGATE 1 +#endif /* Define if using libltdl to support dynamically loadable modules */ #ifndef MAGICKCORE_LTDL_DELEGATE @@ -1227,7 +1237,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/opt/intel/lib/intel64:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/octave/3.4.2:/usr/lib64/qt-3.3/lib:/usr/lib64/tracker-0.12:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1278,7 +1288,9 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -/* #undef OPENEXR_DELEGATE */ +#ifndef MAGICKCORE_OPENEXR_DELEGATE +#define MAGICKCORE_OPENEXR_DELEGATE 1 +#endif /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -1348,7 +1360,9 @@ #endif /* Define if you have RSVG library */ -/* #undef RSVG_DELEGATE */ +#ifndef MAGICKCORE_RSVG_DELEGATE +#define MAGICKCORE_RSVG_DELEGATE 1 +#endif /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1506,7 +1520,9 @@ #endif /* Define if you have WEBP library */ -/* #undef WEBP_DELEGATE */ +#ifndef MAGICKCORE_WEBP_DELEGATE +#define MAGICKCORE_WEBP_DELEGATE 1 +#endif /* Define to use the Windows GDI32 library */ /* #undef WINGDI32_DELEGATE */ @@ -1515,7 +1531,9 @@ /* #undef WITH_DMALLOC */ /* Define if you have WMF library */ -/* #undef WMF_DELEGATE */ +#ifndef MAGICKCORE_WMF_DELEGATE +#define MAGICKCORE_WMF_DELEGATE 1 +#endif /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -1571,7 +1589,9 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -/* #undef _OPENCL */ +#ifndef MAGICKCORE__OPENCL +#define MAGICKCORE__OPENCL 1 +#endif /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 462b1f335..d8694c045 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -3406,7 +3406,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, /* Starting Defaults */ GetPixelInfo(image,&result); - SetPixelInfo(image,q,&result); + GetPixelInfoPixel(image,q,&result); if ( method != VoronoiMorphology ) result.alpha = QuantumRange - result.alpha; @@ -3464,7 +3464,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if ( IsNan(*k) ) continue; if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) ) { - SetPixelInfo(image,k_pixels+u*GetPixelChannels(image), + GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image), &result); result.alpha += *k; } @@ -3479,7 +3479,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if ( IsNan(*k) ) continue; if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) ) { - SetPixelInfo(image,k_pixels+u*GetPixelChannels(image), + GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image), &result); result.alpha += *k; } @@ -3492,7 +3492,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, /* Assign the resulting pixel values - Clamping Result */ switch ( method ) { case VoronoiMorphology: - SetPixelPixelInfo(image,&result,q); + SetPixelInfoPixel(image,&result,q); break; default: if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) @@ -3590,7 +3590,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, /* Default - previously modified pixel */ GetPixelInfo(image,&result); - SetPixelInfo(image,q,&result); + GetPixelInfoPixel(image,q,&result); if ( method != VoronoiMorphology ) result.alpha = QuantumRange - result.alpha; @@ -3648,7 +3648,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if ( IsNan(*k) ) continue; if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) ) { - SetPixelInfo(image,k_pixels+u*GetPixelChannels(image), + GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image), &result); result.alpha += *k; } @@ -3663,7 +3663,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if ( IsNan(*k) ) continue; if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) ) { - SetPixelInfo(image,k_pixels+u*GetPixelChannels(image), + GetPixelInfoPixel(image,k_pixels+u*GetPixelChannels(image), &result); result.alpha += *k; } @@ -3676,7 +3676,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, /* Assign the resulting pixel values - Clamping Result */ switch ( method ) { case VoronoiMorphology: - SetPixelPixelInfo(image,&result,q); + SetPixelInfoPixel(image,&result,q); break; default: if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 75f1a1519..a6ca982ed 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -237,7 +237,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, { if (GetPixelAlpha(image,q) == TransparentAlpha) break; - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert) break; SetPixelAlpha(floodplane_image,TransparentAlpha,q); @@ -270,7 +270,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, { if (GetPixelAlpha(image,q) == TransparentAlpha) break; - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert) break; SetPixelAlpha(floodplane_image,TransparentAlpha,q); @@ -299,7 +299,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, { if (GetPixelAlpha(image,q) == TransparentAlpha) break; - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert) break; p+=GetPixelChannels(image); @@ -801,7 +801,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, pixel=zero; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,q,&pixel); + GetPixelInfoPixel(image,q,&pixel); if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert) { if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) @@ -938,7 +938,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, pixel=zero; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,q,&pixel); + GetPixelInfoPixel(image,q,&pixel); if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert) SetPixelAlpha(image,opacity,q); q+=GetPixelChannels(image); @@ -1067,7 +1067,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, GetPixelInfo(image,&pixel); for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,q,&pixel); + GetPixelInfoPixel(image,q,&pixel); match=((pixel.red >= low->red) && (pixel.red <= high->red) && (pixel.green >= low->green) && (pixel.green <= high->green) && (pixel.blue >= low->blue) && (pixel.blue <= high->blue)) ? MagickTrue : diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index 90d3e7e45..ab71d0f40 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -29,120 +29,138 @@ extern "C" { #undef index -static inline Quantum GetPixelAlpha(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelAlpha(const Image *restrict image, + const Quantum *restrict pixel) { + if (image->channel_map[AlphaPixelChannel].traits == UndefinedPixelTrait) + return(OpaqueAlpha); return(pixel[image->channel_map[AlphaPixelChannel].channel]); } -static inline PixelTrait GetPixelAlphaTraits(const Image *image) +static inline PixelTrait GetPixelAlphaTraits(const Image *restrict image) { return(image->channel_map[AlphaPixelChannel].traits); } -static inline Quantum GetPixelBlack(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelBlack(const Image *restrict image, + const Quantum *restrict pixel) { + if (image->channel_map[BlackPixelChannel].traits == UndefinedPixelTrait) + return(0); return(pixel[image->channel_map[BlackPixelChannel].channel]); } -static inline PixelTrait GetPixelBlackTraits(const Image *image) +static inline PixelTrait GetPixelBlackTraits(const Image *restrict image) { return(image->channel_map[BlackPixelChannel].traits); } -static inline Quantum GetPixelBlue(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelBlue(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[BluePixelChannel].channel]); } -static inline PixelTrait GetPixelBlueTraits(const Image *image) +static inline PixelTrait GetPixelBlueTraits(const Image *restrict image) { return(image->channel_map[BluePixelChannel].traits); } -static inline Quantum GetPixelCb(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelCb(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[CbPixelChannel].channel]); } -static inline PixelTrait GetPixelCbTraits(const Image *image) +static inline PixelTrait GetPixelCbTraits(const Image *restrict image) { return(image->channel_map[CbPixelChannel].traits); } -static inline Quantum GetPixelChannel(const Image *image, - const PixelChannel channel,const Quantum *pixel) +static inline Quantum GetPixelChannel(const Image *restrict image, + const PixelChannel channel,const Quantum *restrict pixel) { + if (image->channel_map[channel].traits == UndefinedPixelTrait) + return(0); return(pixel[image->channel_map[channel].channel]); } -static inline PixelChannel GetPixelChannelMapChannel(const Image *image, - const PixelChannel channel) +static inline PixelChannel GetPixelChannelMapChannel( + const Image *restrict image,const PixelChannel channel) { return(image->channel_map[channel].channel); } -static inline PixelTrait GetPixelChannelMapTraits(const Image *image, +static inline PixelTrait GetPixelChannelMapTraits(const Image *restrict image, const PixelChannel channel) { return(image->channel_map[channel].traits); } -static inline size_t GetPixelChannels(const Image *image) +static inline size_t GetPixelChannels(const Image *restrict image) { return(image->number_channels); } -static inline Quantum GetPixelCr(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelCr(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[CrPixelChannel].channel]); } -static inline PixelTrait GetPixelCrTraits(const Image *image) +static inline PixelTrait GetPixelCrTraits(const Image *restrict image) { return(image->channel_map[CrPixelChannel].traits); } -static inline Quantum GetPixelCyan(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelCyan(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[CyanPixelChannel].channel]); } -static inline PixelTrait GetPixelCyanTraits(const Image *image) +static inline PixelTrait GetPixelCyanTraits(const Image *restrict image) { return(image->channel_map[CyanPixelChannel].traits); } -static inline Quantum GetPixelGray(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelGray(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[GrayPixelChannel].channel]); } -static inline PixelTrait GetPixelGrayTraits(const Image *image) +static inline PixelTrait GetPixelGrayTraits(const Image *restrict image) { return(image->channel_map[GrayPixelChannel].traits); } -static inline Quantum GetPixelGreen(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelGreen(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[GreenPixelChannel].channel]); } -static inline PixelTrait GetPixelGreenTraits(const Image *image) +static inline PixelTrait GetPixelGreenTraits(const Image *restrict image) { return(image->channel_map[GreenPixelChannel].traits); } -static inline Quantum GetPixelIndex(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelIndex(const Image *restrict image, + const Quantum *restrict pixel) { + if (image->channel_map[IndexPixelChannel].traits == UndefinedPixelTrait) + return(0); return(pixel[image->channel_map[IndexPixelChannel].channel]); } -static inline PixelTrait GetPixelIndexTraits(const Image *image) +static inline PixelTrait GetPixelIndexTraits(const Image *restrict image) { return(image->channel_map[IndexPixelChannel].traits); } -static inline Quantum GetPixelInfoIntensity(const PixelInfo *pixel_info) +static inline Quantum GetPixelInfoIntensity( + const PixelInfo *restrict pixel_info) { #if !defined(MAGICKCORE_HDRI_SUPPORT) return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114* @@ -153,7 +171,8 @@ static inline Quantum GetPixelInfoIntensity(const PixelInfo *pixel_info) #endif } -static inline Quantum GetPixelInfoLuminance(const PixelInfo *pixel_info) +static inline Quantum GetPixelInfoLuminance( + const PixelInfo *restrict pixel_info) { Quantum luminance; @@ -168,75 +187,91 @@ static inline Quantum GetPixelInfoLuminance(const PixelInfo *pixel_info) return((Quantum) luminance); } -static inline Quantum GetPixelMagenta(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelMagenta(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[MagentaPixelChannel].channel]); } -static inline PixelTrait GetPixelMagentaTraits(const Image *image) +static inline PixelTrait GetPixelMagentaTraits(const Image *restrict image) { return(image->channel_map[MagentaPixelChannel].traits); } -static inline size_t GetPixelMetaChannels(const Image *image) +static inline size_t GetPixelMetaChannels(const Image *restrict image) { return(image->number_meta_channels); } -static inline size_t GetPixelMetacontentExtent(const Image *image) +static inline size_t GetPixelMetacontentExtent(const Image *restrict image) { return(image->metacontent_extent); } -static inline Quantum GetPixelRed(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelRed(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[RedPixelChannel].channel]); } -static inline PixelTrait GetPixelRedTraits(const Image *image) +static inline PixelTrait GetPixelRedTraits(const Image *restrict image) { return(image->channel_map[RedPixelChannel].traits); } -static inline void GetPixelInfoPixel(const Image *image,const Quantum *pixel, - PixelInfo *packet) +static inline void GetPixelInfoPixel(const Image *restrict image, + const Quantum *restrict pixel,PixelInfo *restrict pixel_info) { - packet->red=(double) pixel[image->channel_map[RedPixelChannel].channel]; - packet->green=(double) pixel[image->channel_map[GreenPixelChannel].channel]; - packet->blue=(double) pixel[image->channel_map[BluePixelChannel].channel]; - packet->alpha=OpaqueAlpha; + pixel_info->red=(MagickRealType) + pixel[image->channel_map[RedPixelChannel].channel]; + pixel_info->green=(MagickRealType) + pixel[image->channel_map[GreenPixelChannel].channel]; + pixel_info->blue=(MagickRealType) + pixel[image->channel_map[BluePixelChannel].channel]; + pixel_info->black=0; + if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait) + pixel_info->black=(MagickRealType) + pixel[image->channel_map[BlackPixelChannel].channel]; + pixel_info->alpha=OpaqueAlpha; if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait) - packet->alpha=(double) pixel[image->channel_map[AlphaPixelChannel].channel]; + pixel_info->alpha=(MagickRealType) + pixel[image->channel_map[AlphaPixelChannel].channel]; + pixel_info->index=0; + if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait) + pixel_info->index=(MagickRealType) + pixel[image->channel_map[IndexPixelChannel].channel]; } -static inline PixelTrait GetPixelTraits(const Image *image, +static inline PixelTrait GetPixelTraits(const Image *restrict image, const PixelChannel channel) { return(image->channel_map[channel].traits); } -static inline Quantum GetPixelY(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelY(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[YPixelChannel].channel]); } -static inline PixelTrait GetPixelYTraits(const Image *image) +static inline PixelTrait GetPixelYTraits(const Image *restrict image) { return(image->channel_map[YPixelChannel].traits); } -static inline Quantum GetPixelYellow(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelYellow(const Image *restrict image, + const Quantum *restrict pixel) { return(pixel[image->channel_map[YellowPixelChannel].channel]); } -static inline PixelTrait GetPixelYellowTraits(const Image *image) +static inline PixelTrait GetPixelYellowTraits(const Image *restrict image) { return(image->channel_map[YellowPixelChannel].traits); } -static inline MagickBooleanType IsPixelEquivalent(const Image *image, - const Quantum *p,const PixelInfo *q) +static inline MagickBooleanType IsPixelEquivalent(const Image *restrict image, + const Quantum *restrict p,const PixelInfo *restrict q) { if (((double) p[image->channel_map[RedPixelChannel].channel] == q->red) && ((double) p[image->channel_map[GreenPixelChannel].channel] == q->green) && @@ -245,8 +280,8 @@ static inline MagickBooleanType IsPixelEquivalent(const Image *image, return(MagickFalse); } -static inline MagickBooleanType IsPixelGray(const Image *image, - const Quantum *pixel) +static inline MagickBooleanType IsPixelGray(const Image *restrict image, + const Quantum *restrict pixel) { #if !defined(MAGICKCORE_HDRI_SUPPORT) if ((pixel[image->channel_map[RedPixelChannel].channel] == @@ -271,8 +306,8 @@ static inline MagickBooleanType IsPixelGray(const Image *image, return(MagickFalse); } -static inline MagickBooleanType IsPixelInfoEquivalent(const PixelInfo *p, - const PixelInfo *q) +static inline MagickBooleanType IsPixelInfoEquivalent( + const PixelInfo *restrict p,const PixelInfo *restrict q) { if ((p->matte != MagickFalse) && (q->matte == MagickFalse) && (fabs(p->alpha-OpaqueAlpha) > 0.5)) @@ -298,8 +333,8 @@ static inline MagickBooleanType IsPixelInfoEquivalent(const PixelInfo *p, return(MagickTrue); } -static inline MagickBooleanType IsPixelMonochrome(const Image *image, - const Quantum *pixel) +static inline MagickBooleanType IsPixelMonochrome(const Image *restrict image, + const Quantum *restrict pixel) { #if !defined(MAGICKCORE_HDRI_SUPPORT) if (((pixel[image->channel_map[RedPixelChannel].channel] == 0) || @@ -330,10 +365,12 @@ static inline MagickBooleanType IsPixelMonochrome(const Image *image, return(MagickFalse); } -static inline MagickBooleanType IsPixelInfoGray(const PixelInfo *pixel) +static inline MagickBooleanType IsPixelInfoGray( + const PixelInfo *restrict pixel_info) { #if !defined(MAGICKCORE_HDRI_SUPPORT) - if ((pixel->red == pixel->green) && (pixel->green == pixel->blue)) + if ((pixel_info->red == pixel_info->green) && + (pixel_info->green == pixel_info->blue)) return(MagickTrue); #else { @@ -341,8 +378,8 @@ static inline MagickBooleanType IsPixelInfoGray(const PixelInfo *pixel) alpha, beta; - alpha=pixel->red-(double) pixel->green; - beta=pixel->green-(double) pixel->blue; + alpha=pixel_info->red-(double) pixel_info->green; + beta=pixel_info->green-(double) pixel_info->blue; if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) return(MagickTrue); } @@ -351,11 +388,12 @@ static inline MagickBooleanType IsPixelInfoGray(const PixelInfo *pixel) } static inline MagickBooleanType IsPixelInfoMonochrome( - const PixelInfo *pixel) + const PixelInfo *restrict pixel_info) { #if !defined(MAGICKCORE_HDRI_SUPPORT) - if (((pixel->red == 0) || (pixel->red == (Quantum) QuantumRange)) && - (pixel->red == pixel->green) && (pixel->green == pixel->blue)) + if (((pixel_info->red == 0) || (pixel_info->red == (Quantum) QuantumRange)) && + (pixel_info->red == pixel_info->green) && + (pixel_info->green == pixel_info->blue)) return(MagickTrue); #else { @@ -363,10 +401,10 @@ static inline MagickBooleanType IsPixelInfoMonochrome( alpha, beta; - alpha=pixel->red-(double) pixel->green; - beta=pixel->green-(double) pixel->blue; - if (((fabs(pixel->red) <= MagickEpsilon) || - (fabs(pixel->red-QuantumRange) <= MagickEpsilon)) && + alpha=pixel_info->red-(double) pixel_info->green; + beta=pixel_info->green-(double) pixel_info->blue; + if (((fabs(pixel_info->red) <= MagickEpsilon) || + (fabs(pixel_info->red-QuantumRange) <= MagickEpsilon)) && (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) return(MagickTrue); } @@ -374,27 +412,11 @@ static inline MagickBooleanType IsPixelInfoMonochrome( return(MagickFalse); } -static inline void SetPacketPixelInfo(const Image *image, - const PixelInfo *pixel_info,PixelInfo *packet) +static inline void SetPixelAlpha(const Image *restrict image, + const Quantum alpha,Quantum *restrict pixel) { - packet->red=pixel_info->red; - packet->green=pixel_info->green; - packet->blue=pixel_info->blue; - packet->black=0; - if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait) - packet->black=pixel_info->black; - packet->alpha=OpaqueAlpha; if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait) - packet->alpha=pixel_info->alpha; - packet->index=0; - if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait) - packet->index=pixel_info->index; -} - -static inline void SetPixelAlpha(const Image *image,const Quantum alpha, - Quantum *pixel) -{ - pixel[image->channel_map[AlphaPixelChannel].channel]=alpha; + pixel[image->channel_map[AlphaPixelChannel].channel]=alpha; } static inline void SetPixelAlphaTraits(Image *image,const PixelTrait traits) @@ -402,10 +424,11 @@ static inline void SetPixelAlphaTraits(Image *image,const PixelTrait traits) image->channel_map[AlphaPixelChannel].traits=traits; } -static inline void SetPixelBlack(const Image *image,const Quantum black, - Quantum *pixel) +static inline void SetPixelBlack(const Image *restrict image, + const Quantum black,Quantum *restrict pixel) { - pixel[image->channel_map[BlackPixelChannel].channel]=black; + if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait) + pixel[image->channel_map[BlackPixelChannel].channel]=black; } static inline void SetPixelBlackTraits(Image *image,const PixelTrait traits) @@ -413,8 +436,8 @@ static inline void SetPixelBlackTraits(Image *image,const PixelTrait traits) image->channel_map[BlackPixelChannel].traits=traits; } -static inline void SetPixelBlue(const Image *image,const Quantum blue, - Quantum *pixel) +static inline void SetPixelBlue(const Image *restrict image,const Quantum blue, + Quantum *restrict pixel) { pixel[image->channel_map[BluePixelChannel].channel]=blue; } @@ -424,8 +447,8 @@ static inline void SetPixelBlueTraits(Image *image,const PixelTrait traits) image->channel_map[BluePixelChannel].traits=traits; } -static inline void SetPixelCb(const Image *image,const Quantum cb, - Quantum *pixel) +static inline void SetPixelCb(const Image *restrict image,const Quantum cb, + Quantum *restrict pixel) { pixel[image->channel_map[CbPixelChannel].channel]=cb; } @@ -435,13 +458,14 @@ static inline void SetPixelCbTraits(Image *image,const PixelTrait traits) image->channel_map[CbPixelChannel].traits=traits; } -static inline void SetPixelChannel(const Image *image, - const PixelChannel channel,const Quantum quantum,Quantum *pixel) +static inline void SetPixelChannel(const Image *restrict image, + const PixelChannel channel,const Quantum quantum,Quantum *restrict pixel) { - pixel[image->channel_map[channel].channel]=quantum; + if (image->channel_map[channel].traits != UndefinedPixelTrait) + pixel[image->channel_map[channel].channel]=quantum; } -static inline void SetPixelChannelMapChannel(const Image *image, +static inline void SetPixelChannelMapChannel(const Image *restrict image, const PixelChannel channel,const PixelChannel channels) { image->channel_map[channel].channel=channels; @@ -464,8 +488,8 @@ static inline void SetPixelChannelMapTraits(Image *image, image->channel_map[channel].traits=traits; } -static inline void SetPixelCr(const Image *image,const Quantum cr, - Quantum *pixel) +static inline void SetPixelCr(const Image *restrict image,const Quantum cr, + Quantum *restrict pixel) { pixel[image->channel_map[CrPixelChannel].channel]=cr; } @@ -475,14 +499,14 @@ static inline void SetPixelCrTraits(Image *image,const PixelTrait traits) image->channel_map[CrPixelChannel].traits=traits; } -static inline void SetPixelCyan(const Image *image,const Quantum cyan, - Quantum *pixel) +static inline void SetPixelCyan(const Image *restrict image,const Quantum cyan, + Quantum *restrict pixel) { pixel[image->channel_map[CyanPixelChannel].channel]=cyan; } -static inline void SetPixelGray(const Image *image,const Quantum gray, - Quantum *pixel) +static inline void SetPixelGray(const Image *restrict image,const Quantum gray, + Quantum *restrict pixel) { pixel[image->channel_map[GrayPixelChannel].channel]=gray; } @@ -492,8 +516,8 @@ static inline void SetPixelGrayTraits(Image *image,const PixelTrait traits) image->channel_map[GrayPixelChannel].traits=traits; } -static inline void SetPixelGreen(const Image *image,const Quantum green, - Quantum *pixel) +static inline void SetPixelGreen(const Image *restrict image, + const Quantum green,Quantum *restrict pixel) { pixel[image->channel_map[GreenPixelChannel].channel]=green; } @@ -503,10 +527,11 @@ static inline void SetPixelGreenTraits(Image *image,const PixelTrait traits) image->channel_map[GreenPixelChannel].traits=traits; } -static inline void SetPixelIndex(const Image *image,const Quantum index, - Quantum *pixel) +static inline void SetPixelIndex(const Image *restrict image, + const Quantum index,Quantum *restrict pixel) { - pixel[image->channel_map[IndexPixelChannel].channel]=index; + if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait) + pixel[image->channel_map[IndexPixelChannel].channel]=index; } static inline void SetPixelIndexTraits(Image *image,const PixelTrait traits) @@ -514,31 +539,42 @@ static inline void SetPixelIndexTraits(Image *image,const PixelTrait traits) image->channel_map[IndexPixelChannel].traits=traits; } -static inline void SetPixelInfo(const Image *image,const Quantum *pixel, - PixelInfo *pixel_info) +static inline void SetPixelInfo(const Image *restrict image, + const PixelInfo *restrict p,PixelInfo *restrict q) { - pixel_info->red=(MagickRealType) - pixel[image->channel_map[RedPixelChannel].channel]; - pixel_info->green=(MagickRealType) - pixel[image->channel_map[GreenPixelChannel].channel]; - pixel_info->blue=(MagickRealType) - pixel[image->channel_map[BluePixelChannel].channel]; - pixel_info->black=0; + q->red=p->red; + q->green=p->green; + q->blue=p->blue; + q->black=0; if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait) - pixel_info->black=(MagickRealType) - pixel[image->channel_map[BlackPixelChannel].channel]; - pixel_info->alpha=OpaqueAlpha; + q->black=p->black; + q->alpha=OpaqueAlpha; if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait) - pixel_info->alpha=(MagickRealType) - pixel[image->channel_map[AlphaPixelChannel].channel]; - pixel_info->index=0; + q->alpha=p->alpha; + q->index=0; if (image->channel_map[IndexPixelChannel].traits != UndefinedPixelTrait) - pixel_info->index=(MagickRealType) - pixel[image->channel_map[IndexPixelChannel].channel]; + q->index=p->index; } -static inline void SetPixelMagenta(const Image *image,const Quantum magenta, - Quantum *pixel) +static inline void SetPixelInfoPixel(const Image *restrict image, + const PixelInfo *restrict pixel_info,Quantum *restrict pixel) +{ + pixel[image->channel_map[RedPixelChannel].channel]= + ClampToQuantum(pixel_info->red); + pixel[image->channel_map[GreenPixelChannel].channel]= + ClampToQuantum(pixel_info->green); + pixel[image->channel_map[BluePixelChannel].channel]= + ClampToQuantum(pixel_info->blue); + if (image->colorspace == CMYKColorspace) + pixel[image->channel_map[BlackPixelChannel].channel]= + ClampToQuantum(pixel_info->black); + if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait) + pixel[image->channel_map[AlphaPixelChannel].channel]= + ClampToQuantum(pixel_info->alpha); +} + +static inline void SetPixelMagenta(const Image *restrict image, + const Quantum magenta,Quantum *restrict pixel) { pixel[image->channel_map[MagentaPixelChannel].channel]=magenta; } @@ -559,8 +595,8 @@ static inline void SetPixelMetacontentExtent(Image *image,const size_t extent) image->metacontent_extent=extent; } -static inline void SetPixelRed(const Image *image,const Quantum red, - Quantum *pixel) +static inline void SetPixelRed(const Image *restrict image,const Quantum red, + Quantum *restrict pixel) { pixel[image->channel_map[RedPixelChannel].channel]=red; } @@ -570,25 +606,8 @@ static inline void SetPixelRedTraits(Image *image,const PixelTrait traits) image->channel_map[RedPixelChannel].traits=traits; } -static inline void SetPixelPixelInfo(const Image *image, - const PixelInfo *pixel_info,Quantum *pixel) -{ - pixel[image->channel_map[RedPixelChannel].channel]= - ClampToQuantum(pixel_info->red); - pixel[image->channel_map[GreenPixelChannel].channel]= - ClampToQuantum(pixel_info->green); - pixel[image->channel_map[BluePixelChannel].channel]= - ClampToQuantum(pixel_info->blue); - if (image->colorspace == CMYKColorspace) - pixel[image->channel_map[BlackPixelChannel].channel]= - ClampToQuantum(pixel_info->black); - if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait) - pixel[image->channel_map[AlphaPixelChannel].channel]= - ClampToQuantum(pixel_info->alpha); -} - -static inline void SetPixelYellow(const Image *image,const Quantum yellow, - Quantum *pixel) +static inline void SetPixelYellow(const Image *restrict image, + const Quantum yellow,Quantum *restrict pixel) { pixel[image->channel_map[YellowPixelChannel].channel]=yellow; } @@ -598,7 +617,8 @@ static inline void SetPixelYellowTraits(Image *image,const PixelTrait traits) image->channel_map[YellowPixelChannel].traits=traits; } -static inline void SetPixelY(const Image *image,const Quantum y,Quantum *pixel) +static inline void SetPixelY(const Image *restrict image,const Quantum y, + Quantum *restrict pixel) { pixel[image->channel_map[YPixelChannel].channel]=y; } @@ -608,7 +628,8 @@ static inline void SetPixelYTraits(Image *image,const PixelTrait traits) image->channel_map[YPixelChannel].traits=traits; } -static inline Quantum GetPixelIntensity(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelIntensity(const Image *restrict image, + const Quantum *restrict pixel) { #if !defined(MAGICKCORE_HDRI_SUPPORT) if ((pixel[image->channel_map[RedPixelChannel].channel] == @@ -638,7 +659,8 @@ static inline Quantum GetPixelIntensity(const Image *image,const Quantum *pixel) #endif } -static inline Quantum GetPixelLuminance(const Image *image,const Quantum *pixel) +static inline Quantum GetPixelLuminance(const Image *restrict image, + const Quantum *restrict pixel) { #if !defined(MAGICKCORE_HDRI_SUPPORT) return((Quantum) (0.21267*pixel[image->channel_map[RedPixelChannel].channel]+ diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h index dc517bcf3..50e849dea 100644 --- a/MagickCore/pixel-private.h +++ b/MagickCore/pixel-private.h @@ -87,7 +87,7 @@ static inline MagickBooleanType IsMonochromePixel(const PixelInfo *pixel) return(MagickFalse); } -static inline void SetPixelInfo(const Image *image, +static inline void GetPixelInfo(const Image *image, const MagickPixelInfo *pixel,PixelInfo *color,IndexPacket *index) { SetPixelRed(color,ClampToQuantum(pixel->red)); diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index ccae297ea..193d63e4e 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4983,7 +4983,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, filter_view=AcquireCacheView(filter_image); p=GetCacheViewVirtualPixels(filter_view,0,0,1,1,exception); if (p != (const Quantum *) NULL) - SetPixelInfo(image,p,pixel); + GetPixelInfoPixel(image,p,pixel); filter_view=DestroyCacheView(filter_view); filter_image=DestroyImage(filter_image); break; @@ -4996,7 +4996,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, status=MagickFalse; break; } - SetPixelInfo(image,p,pixel); + GetPixelInfoPixel(image,p,pixel); break; } case MeshInterpolatePixel: @@ -5128,7 +5128,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, status=MagickFalse; break; } - SetPixelInfo(image,p,pixel); + GetPixelInfoPixel(image,p,pixel); break; } case SplineInterpolatePixel: diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index 8d132e3ca..91ff45d89 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -344,7 +344,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, 0x00 : 0x01); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; } @@ -360,7 +360,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, 0x00 : 0x01); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; } @@ -376,13 +376,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, pixel=(unsigned char) ((*p >> 4) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; pixel=(unsigned char) ((*p) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p++; q+=channels; @@ -392,7 +392,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, pixel=(unsigned char) ((*p++ >> 4) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; } @@ -408,7 +408,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushCharPixel(p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -428,7 +428,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)), &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -440,7 +440,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushShortPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -462,7 +462,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushFloatPixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -474,7 +474,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushLongPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -493,7 +493,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushDoublePixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -508,7 +508,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -589,7 +589,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, pixel=(unsigned char) ((*p >> 4) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); pixel=(unsigned char) ((*p) & 0xf); SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q); @@ -608,7 +608,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushCharPixel(p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushCharPixel(p,&pixel); SetPixelAlpha(image,ScaleCharToQuantum(pixel),q); @@ -630,7 +630,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)), &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushShortPixel(endian,p,&pixel); SetPixelAlpha(image,ClampToQuantum((MagickRealType) @@ -645,7 +645,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushShortPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushShortPixel(endian,p,&pixel); SetPixelAlpha(image,ScaleShortToQuantum(pixel),q); @@ -669,7 +669,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushFloatPixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushFloatPixel(&quantum_state,p,&pixel); SetPixelAlpha(image,ClampToQuantum(pixel),q); @@ -683,7 +683,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushLongPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushLongPixel(endian,p,&pixel); SetPixelAlpha(image,ScaleLongToQuantum(pixel),q); @@ -704,7 +704,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushDoublePixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushDoublePixel(&quantum_state,p,&pixel); SetPixelAlpha(image,ClampToQuantum(pixel),q); @@ -722,7 +722,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q); diff --git a/MagickCore/resample.c b/MagickCore/resample.c index 2ef80675d..7f7674a70 100644 --- a/MagickCore/resample.c +++ b/MagickCore/resample.c @@ -485,7 +485,7 @@ MagickExport MagickBooleanType ResamplePixelColor( *pixel=resample_filter->average_pixel; /* FAILED */ break; } - SetPixelInfo(resample_filter->image,pixels, + GetPixelInfoPixel(resample_filter->image,pixels, &(resample_filter->average_pixel)); average_view=DestroyCacheView(average_view); average_image=DestroyImage(average_image); diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 1fe0d7373..423b08fc0 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -1554,25 +1554,25 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, if ((x_offset+i) < step) { p+=GetPixelChannels(image); - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); q+=GetPixelChannels(image); continue; } - SetPixelInfo(image,p,&source); + GetPixelInfoPixel(image,p,&source); CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &source,(MagickRealType) GetPixelAlpha(image,p),area,&destination); - SetPixelPixelInfo(image,&destination,q); - SetPixelInfo(image,p,&pixel); + SetPixelInfoPixel(image,&destination,q); + GetPixelInfoPixel(image,p,&pixel); p+=GetPixelChannels(image); q+=GetPixelChannels(image); } CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &background,(MagickRealType) background.alpha,area,&destination); - SetPixelPixelInfo(image,&destination,q); + SetPixelInfoPixel(image,&destination,q); q+=GetPixelChannels(image); for (i=0; i < (step-1); i++) { - SetPixelPixelInfo(image,&background,q); + SetPixelInfoPixel(image,&background,q); q+=GetPixelChannels(image); } break; @@ -1590,20 +1590,20 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, q-=GetPixelChannels(image); if ((size_t) (x_offset+width+step-i) >= image->columns) continue; - SetPixelInfo(image,p,&source); + GetPixelInfoPixel(image,p,&source); CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &source,(MagickRealType) GetPixelAlpha(image,p),area,&destination); - SetPixelPixelInfo(image,&destination,q); - SetPixelInfo(image,p,&pixel); + SetPixelInfoPixel(image,&destination,q); + GetPixelInfoPixel(image,p,&pixel); } CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &background,(MagickRealType) background.alpha,area,&destination); q-=GetPixelChannels(image); - SetPixelPixelInfo(image,&destination,q); + SetPixelInfoPixel(image,&destination,q); for (i=0; i < (step-1); i++) { q-=GetPixelChannels(image); - SetPixelPixelInfo(image,&background,q); + SetPixelInfoPixel(image,&background,q); } break; } @@ -1769,26 +1769,26 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, if ((y_offset+i) < step) { p+=GetPixelChannels(image); - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); q+=GetPixelChannels(image); continue; } - SetPixelInfo(image,p,&source); + GetPixelInfoPixel(image,p,&source); CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &source,(MagickRealType) GetPixelAlpha(image,p),area, &destination); - SetPixelPixelInfo(image,&destination,q); - SetPixelInfo(image,p,&pixel); + SetPixelInfoPixel(image,&destination,q); + GetPixelInfoPixel(image,p,&pixel); p+=GetPixelChannels(image); q+=GetPixelChannels(image); } CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &background,(MagickRealType) background.alpha,area,&destination); - SetPixelPixelInfo(image,&destination,q); + SetPixelInfoPixel(image,&destination,q); q+=GetPixelChannels(image); for (i=0; i < (step-1); i++) { - SetPixelPixelInfo(image,&background,q); + SetPixelInfoPixel(image,&background,q); q+=GetPixelChannels(image); } break; @@ -1806,21 +1806,21 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, q-=GetPixelChannels(image); if ((size_t) (y_offset+height+step-i) >= image->rows) continue; - SetPixelInfo(image,p,&source); + GetPixelInfoPixel(image,p,&source); CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &source,(MagickRealType) GetPixelAlpha(image,p),area, &destination); - SetPixelPixelInfo(image,&destination,q); - SetPixelInfo(image,p,&pixel); + SetPixelInfoPixel(image,&destination,q); + GetPixelInfoPixel(image,p,&pixel); } CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha, &background,(MagickRealType) background.alpha,area,&destination); q-=GetPixelChannels(image); - SetPixelPixelInfo(image,&destination,q); + SetPixelInfoPixel(image,&destination,q); for (i=0; i < (step-1); i++) { q-=GetPixelChannels(image); - SetPixelPixelInfo(image,&background,q); + SetPixelInfoPixel(image,&background,q); } break; } diff --git a/MagickCore/version.h b/MagickCore/version.h index b6dbbb721..1057efb56 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "5982" +#define MagickSVNRevision "exported" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index 6fa824d31..6556d43ba 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -2516,7 +2516,7 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display, /* Set this pixel to the background color. */ - SetPixelPixelInfo(draw_image,&draw_image->background_color,q); + SetPixelInfoPixel(draw_image,&draw_image->background_color,q); SetPixelAlpha(draw_image,(Quantum) (draw_info->stencil == OpaqueStencil ? TransparentAlpha : OpaqueAlpha),q); } @@ -4506,7 +4506,7 @@ static Image *XGetWindowImage(Display *display,const Window window, { index=(Quantum) XGetPixel(ximage,x,y); SetPixelIndex(composite_image,index,q); - SetPixelPixelInfo(composite_image, + SetPixelInfoPixel(composite_image, composite_image->colormap+(ssize_t) index,q); q+=GetPixelChannels(composite_image); } diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c index 0d6c6e64d..f34736cc1 100644 --- a/MagickWand/pixel-wand.c +++ b/MagickWand/pixel-wand.c @@ -2094,11 +2094,11 @@ WandExport void PixelSetMagentaQuantum(PixelWand *wand,const Quantum magenta) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% PixelSetPixelInfo() sets the color of the pixel wand. +% PixelGetPixelInfoPixel() sets the color of the pixel wand. % % The format of the PixelSetPixelInfo method is: % -% PixelSetPixelInfo(PixelWand *wand,const PixelInfo *color) +% PixelGetPixelInfoPixel(PixelWand *wand,const PixelInfo *color) % % A description of each parameter follows: % @@ -2107,7 +2107,7 @@ WandExport void PixelSetMagentaQuantum(PixelWand *wand,const Quantum magenta) % o color: the pixel wand color. % */ -WandExport void PixelSetPixelInfo(PixelWand *wand, +WandExport void PixelGetPixelInfoPixel(PixelWand *wand, const PixelInfo *color) { assert(wand != (const PixelWand *) NULL); diff --git a/MagickWand/pixel-wand.h b/MagickWand/pixel-wand.h index b288a600f..e7d014cd1 100644 --- a/MagickWand/pixel-wand.h +++ b/MagickWand/pixel-wand.h @@ -100,7 +100,7 @@ extern WandExport void PixelSetIndex(PixelWand *,const Quantum), PixelSetMagenta(PixelWand *,const double), PixelSetMagentaQuantum(PixelWand *,const Quantum), - PixelSetPixelInfo(PixelWand *,const PixelInfo *), + PixelGetPixelInfoPixel(PixelWand *,const PixelInfo *), PixelSetAlpha(PixelWand *,const double), PixelSetAlphaQuantum(PixelWand *,const Quantum), PixelSetQuantumPacket(PixelWand *,const PixelInfo *), diff --git a/coders/debug.c b/coders/debug.c index b287e6caa..9da08b501 100644 --- a/coders/debug.c +++ b/coders/debug.c @@ -226,7 +226,7 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info, (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double) x,(double) y); (void) WriteBlobString(image,buffer); - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); (void) FormatLocaleString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ", (double) pixel.red,(double) pixel.green,(double) pixel.blue); if (pixel.colorspace == CMYKColorspace) diff --git a/coders/gif.c b/coders/gif.c index 3794ccf3f..73b314cd0 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -443,7 +443,7 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity, break; index=ConstrainColormapIndex(image,(size_t) c,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha : OpaqueAlpha,q); x++; diff --git a/coders/jbig.c b/coders/jbig.c index 58113afc7..9395e9494 100644 --- a/coders/jbig.c +++ b/coders/jbig.c @@ -235,7 +235,7 @@ static Image *ReadJBIGImage(const ImageInfo *image_info, if (bit == 8) bit=0; SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/jpeg.c b/coders/jpeg.c index 18d630e55..67c7e5b49 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -1293,7 +1293,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4); index=ConstrainColormapIndex(image,pixel,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -1331,7 +1331,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, { index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p),exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } diff --git a/coders/map.c b/coders/map.c index 82199a25a..bd680b2b1 100644 --- a/coders/map.c +++ b/coders/map.c @@ -227,7 +227,7 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception) p++; } SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/miff.c b/coders/miff.c index f3b28773c..cb9b6bf73 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -2409,11 +2409,11 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, case RLECompression: { length=0; - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); p+=GetPixelChannels(image); for (x=1; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,p,&target); + GetPixelInfoPixel(image,p,&target); if ((length < 255) && (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse)) length++; @@ -2422,7 +2422,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, q=PopRunlengthPacket(image,q,length,&pixel,exception); length=0; } - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); p+=GetPixelChannels(image); } q=PopRunlengthPacket(image,q,length,&pixel,exception); diff --git a/coders/null.c b/coders/null.c index 842d1d938..65f912a73 100644 --- a/coders/null.c +++ b/coders/null.c @@ -138,7 +138,7 @@ static Image *ReadNULLImage(const ImageInfo *image_info, break; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPixelInfo(image,&background,q); + SetPixelInfoPixel(image,&background,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/palm.c b/coders/palm.c index 8baf5412e..abc3a7be1 100644 --- a/coders/palm.c +++ b/coders/palm.c @@ -489,7 +489,7 @@ static Image *ReadPALMImage(const ImageInfo *image_info, ThrowReaderException(CorruptImageError,"CorruptImage"); index=(Quantum) (mask-(((*ptr) & (mask << bit)) >> bit)); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); if (bit) bit-=bits_per_pixel; else diff --git a/coders/png.c b/coders/png.c index cc10247c8..81b7a4c8c 100644 --- a/coders/png.c +++ b/coders/png.c @@ -8521,7 +8521,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (GetPixelAlpha(image,r) < OpaqueAlpha/2) { - SetPixelPixelInfo(image,&image->background_color,r); + SetPixelInfoPixel(image,&image->background_color,r); SetPixelAlpha(image,TransparentAlpha,r); } else diff --git a/coders/psd.c b/coders/psd.c index 0207dd6fb..679126bb1 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -652,7 +652,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, SetPixelIndex(image,ScaleQuantumToChar(pixel),q); else SetPixelIndex(image,ScaleQuantumToShort(pixel),q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); if (image->depth == 1) { @@ -667,7 +667,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, { SetPixelIndex(image,(((unsigned char) pixel) & (0x01 << (7-bit))) != 0 ? 0 : 255,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) + SetPixelInfoPixel(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=GetPixelChannels(image); x++; diff --git a/coders/svg.c b/coders/svg.c index 779d2244a..8a9a12063 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -3403,7 +3403,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); (void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception); (void) FormatLocaleString(message,MaxTextExtent, " \n", diff --git a/coders/ttf.c b/coders/ttf.c index 170d754d4..fdaf912a1 100644 --- a/coders/ttf.c +++ b/coders/ttf.c @@ -237,7 +237,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPixelInfo(image,&background_color,q); + SetPixelInfoPixel(image,&background_color,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/txt.c b/coders/txt.c index 412a30cc6..56c7154cb 100644 --- a/coders/txt.c +++ b/coders/txt.c @@ -668,7 +668,7 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image, (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double) x,(double) y); (void) WriteBlobString(image,buffer); - SetPixelInfo(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); (void) CopyMagickString(tuple,"(",MaxTextExtent); ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance, tuple); diff --git a/coders/wpg.c b/coders/wpg.c index 0e1b8ec5e..743049d4f 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -292,7 +292,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, { index=((*p) & (0x80 >> bit) ? 0x01 : 0x00); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } p++; @@ -303,7 +303,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, { index=((*p) & (0x80 >> bit) ? 0x01 : 0x00); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } p++; @@ -321,19 +321,19 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, { index=ConstrainColormapIndex(image,(*p >> 6) & 0x3,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p >> 4) & 0x3,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p >> 2) & 0x3,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p) & 0x3,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -341,14 +341,14 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, { index=ConstrainColormapIndex(image,(*p >> 6) & 0x3,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); if ((image->columns % 4) >= 1) { index=ConstrainColormapIndex(image,(*p >> 4) & 0x3,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); if ((image->columns % 4) >= 2) @@ -356,7 +356,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, index=ConstrainColormapIndex(image,(*p >> 2) & 0x3, exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } } @@ -376,11 +376,11 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, { index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p) & 0x0f,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -388,7 +388,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, { index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -405,7 +405,7 @@ static void InsertRow(Image *image,unsigned char *p,ssize_t y,int bpp, { index=ConstrainColormapIndex(image,*p,exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } diff --git a/coders/xc.c b/coders/xc.c index 1664ae8c4..59b81700d 100644 --- a/coders/xc.c +++ b/coders/xc.c @@ -137,7 +137,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception) image->colorspace=color.colorspace; image->matte=color.matte; pixel.black=0; - SetPacketPixelInfo(image,&color,&pixel); + SetPixelInfo(image,&color,&pixel); for (y=0; y < (ssize_t) image->rows; y++) { q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); @@ -145,7 +145,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPixelInfo(image,&pixel,q); + SetPixelInfoPixel(image,&pixel,q); if (image->colorspace == CMYKColorspace) SetPixelBlack(image,pixel.black,q); q+=GetPixelChannels(image); diff --git a/coders/xpm.c b/coders/xpm.c index dc579abd2..1e69e60a2 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -405,7 +405,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) j=(ssize_t) GetValueFromSplayTree(xpm_colors,key); if (image->storage_class == PseudoClass) SetPixelIndex(image,j,r); - SetPixelPixelInfo(image,image->colormap+j,r); + SetPixelInfoPixel(image,image->colormap+j,r); p+=width; r+=GetPixelChannels(image); } diff --git a/coders/xwd.c b/coders/xwd.c index ab47d874d..2154a7eec 100644 --- a/coders/xwd.c +++ b/coders/xwd.c @@ -476,7 +476,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception) index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x, (int) y),exception); SetPixelIndex(image,index,q); - SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); + SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) -- 2.50.1