From: cristy Date: Sun, 29 May 2011 21:13:36 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7471 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3da0b407cca2ae0112df448b5eb15047a552b3aa;p=imagemagick --- diff --git a/coders/aai.c b/coders/aai.c index d2af8aa21..234e1437c 100644 --- a/coders/aai.c +++ b/coders/aai.c @@ -177,8 +177,7 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception) SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); if (*p == 254) *p=255; - SetOpacityPixelComponent(q,(QuantumRange- - ScaleCharToQuantum(*p++))); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); if (q->opacity != OpaqueOpacity) image->matte=MagickTrue; q++; diff --git a/coders/avs.c b/coders/avs.c index 4bd35f172..11bd2abf7 100644 --- a/coders/avs.c +++ b/coders/avs.c @@ -172,8 +172,7 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - SetOpacityPixelComponent(q,(QuantumRange- - ScaleCharToQuantum(*p++))); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); diff --git a/coders/dcm.c b/coders/dcm.c index 265c2feee..c67a0044c 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3747,9 +3747,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) } case 3: { - SetOpacityPixelComponent(q,(QuantumRange- - ScaleCharToQuantum((unsigned char) ReadDCMByte(stream_info, - image)))); + SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char) + ReadDCMByte(stream_info,image))); break; } default: diff --git a/coders/exr.c b/coders/exr.c index ccd9c9766..73932216f 100644 --- a/coders/exr.c +++ b/coders/exr.c @@ -230,8 +230,8 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception) ImfHalfToFloat(scanline[x].g))); SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange* ImfHalfToFloat(scanline[x].b))); - SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange- - QuantumRange*ImfHalfToFloat(scanline[x].a))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange* + ImfHalfToFloat(scanline[x].a))); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/icon.c b/coders/icon.c index 8f0c3d110..4cfd35d2b 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -550,8 +550,8 @@ static Image *ReadICONImage(const ImageInfo *image_info, SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char) ReadBlobByte(image))); if (icon_info.bits_per_pixel == 32) - SetOpacityPixelComponent(q,(QuantumRange-ScaleCharToQuantum( - (unsigned char) ReadBlobByte(image)))); + SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char) + ReadBlobByte(image))); q++; } if (icon_info.bits_per_pixel == 24) diff --git a/coders/jp2.c b/coders/jp2.c index 5585cff96..a70d0913d 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -581,8 +581,8 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel, range[2])); pixel=(QuantumAny) jas_matrix_getv(pixels[3],x/x_step[3]); - SetOpacityPixelComponent(q,(QuantumRange- - ScaleAnyToQuantum((QuantumAny) pixel,range[3]))); + SetAlphaPixelComponent(q,ScaleAnyToQuantum((QuantumAny) pixel, + range[3])); q++; } break; diff --git a/coders/pcx.c b/coders/pcx.c index 70ced8533..e1971880d 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -609,7 +609,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) SetGreenPixelComponent(q,ScaleCharToQuantum(*r++)); SetBluePixelComponent(q,ScaleCharToQuantum(*r++)); if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(*r++)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*r++)); } q++; } diff --git a/coders/pict.c b/coders/pict.c index 9ddf918cf..9b857cd1c 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -1213,8 +1213,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info, if (p > (pixels+extent+3*image->columns)) ThrowReaderException(CorruptImageError, "NotEnoughPixelData"); - SetOpacityPixelComponent(q,(Quantum) (QuantumRange- - ScaleCharToQuantum(*p))); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p)); SetRedPixelComponent(q,ScaleCharToQuantum( *(p+tile_image->columns))); SetGreenPixelComponent(q,ScaleCharToQuantum( diff --git a/coders/png.c b/coders/png.c index 528c961fb..93a28d484 100644 --- a/coders/png.c +++ b/coders/png.c @@ -3107,7 +3107,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { quantum=((*p++) << 8); quantum|=(*p++); - SetOpacityPixelComponent(q,(Quantum) (QuantumRange-quantum)); + SetAlphaPixelComponent(q,quantum); if (GetOpacityPixelComponent(q) != OpaqueOpacity) found_transparent_pixel = MagickTrue; q++; @@ -3146,7 +3146,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if (ping_color_type == 4) { - SetOpacityPixelComponent(q,(Quantum) (QuantumRange-(*p++))); + SetAlphaPixelComponent(q,*p++); if (GetOpacityPixelComponent(q) != OpaqueOpacity) found_transparent_pixel = MagickTrue; p++; @@ -4383,8 +4383,7 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, else for (x=(ssize_t) image->columns; x != 0; x--,q++,s++) { - SetOpacityPixelComponent(q,(Quantum) QuantumRange- - GetRedPixelComponent(s)); + SetAlphaPixelComponent(q,GetRedPixelComponent(s)); if (GetOpacityPixelComponent(q) != OpaqueOpacity) image->matte=MagickTrue; } diff --git a/coders/psd.c b/coders/psd.c index 5f35693ee..a25f245e4 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -636,7 +636,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, { case -1: { - SetOpacityPixelComponent(q,QuantumRange-pixel); + SetAlphaPixelComponent(q,pixel); break; } case 0: @@ -682,7 +682,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, case 1: { if (image->storage_class == PseudoClass) - SetOpacityPixelComponent(q,QuantumRange-pixel); + SetAlphaPixelComponent(q,pixel); else SetGreenPixelComponent(q,pixel); break; @@ -690,7 +690,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, case 2: { if (image->storage_class == PseudoClass) - SetOpacityPixelComponent(q,QuantumRange-pixel); + SetAlphaPixelComponent(q,pixel); else SetBluePixelComponent(q,pixel); break; @@ -700,14 +700,14 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, if (image->colorspace == CMYKColorspace) SetIndexPixelComponent(indexes+x,pixel); else - SetOpacityPixelComponent(q,QuantumRange-pixel); + SetAlphaPixelComponent(q,pixel); break; } case 4: { if ((image->colorspace == RGBColorspace) && (channels > 3)) break; - SetOpacityPixelComponent(q,QuantumRange-pixel); + SetAlphaPixelComponent(q,pixel); break; } default: diff --git a/coders/rla.c b/coders/rla.c index 8480b9115..d9505716b 100644 --- a/coders/rla.c +++ b/coders/rla.c @@ -320,8 +320,7 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception) case 3: default: { - SetOpacityPixelComponent(q,QuantumRange- - ScaleCharToQuantum(byte)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(byte)); break; } } @@ -361,7 +360,7 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception) case 3: default: { - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(byte)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(byte)); break; } } diff --git a/coders/rle.c b/coders/rle.c index f036d5cf8..08d165bae 100644 --- a/coders/rle.c +++ b/coders/rle.c @@ -448,7 +448,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -532,8 +532,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) SetRedPixelComponent(q,image->colormap[*p++].red); SetGreenPixelComponent(q,image->colormap[*p++].green); SetBluePixelComponent(q,image->colormap[*p++].blue); - SetOpacityPixelComponent(q,QuantumRange- - ScaleCharToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -546,8 +545,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } - image->colormap=(PixelPacket *) - RelinquishMagickMemory(image->colormap); + image->colormap=(PixelPacket *) RelinquishMagickMemory( + image->colormap); image->storage_class=DirectClass; image->colors=0; } diff --git a/coders/sgi.c b/coders/sgi.c index eb5e2d7da..da85fdbae 100644 --- a/coders/sgi.c +++ b/coders/sgi.c @@ -559,8 +559,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) ((*(p+4) << 8) | (*(p+5))))); SetOpacityPixelComponent(q,OpaqueOpacity); if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum( - (unsigned short) ((*(p+6) << 8) | (*(p+7))))); + SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short) + ((*(p+6) << 8) | (*(p+7))))); p+=8; q++; } @@ -589,8 +589,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) q->blue=ScaleCharToQuantum(*(p+2)); SetOpacityPixelComponent(q,OpaqueOpacity); if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,QuantumRange- - ScaleCharToQuantum(*(p+3))); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*(p+3))); p+=4; q++; } diff --git a/coders/sun.c b/coders/sun.c index 95b073644..901f222f0 100644 --- a/coders/sun.c +++ b/coders/sun.c @@ -521,8 +521,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception) for (x=0; x < (ssize_t) image->columns; x++) { if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,(QuantumRange- - ScaleCharToQuantum(*p++))); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); if (sun_info.type == RT_STANDARD) { SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); diff --git a/coders/tiff.c b/coders/tiff.c index 02916f81d..f2e538c46 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -1503,8 +1503,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, TIFFGetG(*p))); SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char) TIFFGetB(*p))); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum( - (unsigned char) TIFFGetA(*p))); + SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char) + TIFFGetA(*p))); q++; p++; } @@ -1590,8 +1590,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char) TIFFGetB(*p))); if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum( - (unsigned char) TIFFGetA(*p))); + SetAlphaPixelComponent(q,ScaleCharToQuantum((unsigned char) + TIFFGetA(*p))); p--; q--; } diff --git a/coders/txt.c b/coders/txt.c index e14c09c79..612633323 100644 --- a/coders/txt.c +++ b/coders/txt.c @@ -486,8 +486,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) range)); } if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum( - pixel.opacity,range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel.opacity,range)); if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } diff --git a/coders/webp.c b/coders/webp.c index 779514026..8bb52bafe 100644 --- a/coders/webp.c +++ b/coders/webp.c @@ -173,7 +173,7 @@ static Image *ReadWEBPImage(const ImageInfo *image_info, SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); - SetOpacityPixelComponent(q,(QuantumRange-ScaleCharToQuantum(*p++))); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); if (q->opacity != OpaqueOpacity) image->matte=MagickTrue; q++; diff --git a/magick/annotate.c b/magick/annotate.c index d3dea05c4..cf912da4d 100644 --- a/magick/annotate.c +++ b/magick/annotate.c @@ -1789,9 +1789,9 @@ static MagickBooleanType RenderPostscript(Image *image, for (x=0; x < (ssize_t) annotate_image->columns; x++) { (void) GetFillColor(draw_info,x,y,&fill_color); - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange- - (((QuantumRange-(MagickRealType) PixelIntensityToQuantum(q))* - (QuantumRange-fill_color.opacity))/QuantumRange))); + SetAlphaPixelComponent(q,ClampToQuantum((((QuantumRange- + (MagickRealType) PixelIntensityToQuantum(q))*(QuantumRange- + fill_color.opacity))/QuantumRange))); SetRedPixelComponent(q,fill_color.red); SetGreenPixelComponent(q,fill_color.green); SetBluePixelComponent(q,fill_color.blue); diff --git a/magick/enhance.c b/magick/enhance.c index 59e4ad8da..bbb7611a4 100644 --- a/magick/enhance.c +++ b/magick/enhance.c @@ -842,9 +842,8 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image, if ((channel & OpacityChannel) != 0) { if (clut_image->matte == MagickFalse) - SetOpacityPixelComponent(q,(QuantumRange- - MagickPixelIntensityToQuantum(clut_map+ScaleQuantumToMap( - (Quantum) GetAlphaPixelComponent(q))))); + SetAlphaPixelComponent(q,MagickPixelIntensityToQuantum(clut_map+ + ScaleQuantumToMap((Quantum) GetAlphaPixelComponent(q)))); else if (image->matte == MagickFalse) SetOpacityPixelComponent(q,ClampOpacityPixelComponent(clut_map+ @@ -2208,8 +2207,8 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, SetOpacityPixelComponent(q,gamma_map[ScaleQuantumToMap( GetOpacityPixelComponent(q))]); else - SetOpacityPixelComponent(q,(Quantum) QuantumRange-gamma_map[ - ScaleQuantumToMap((Quantum) GetAlphaPixelComponent(q))]); + SetAlphaPixelComponent(q,gamma_map[ScaleQuantumToMap((Quantum) + GetAlphaPixelComponent(q))]); } } q++; @@ -2676,8 +2675,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image, SetBluePixelComponent(q,LevelQuantum(GetBluePixelComponent(q))); if (((channel & OpacityChannel) != 0) && (image->matte == MagickTrue)) - SetOpacityPixelComponent(q,QuantumRange-LevelQuantum(QuantumRange- - q->opacity)); + SetAlphaPixelComponent(q,LevelQuantum(GetAlphaPixelComponent(q))); if (((channel & IndexChannel) != 0) && (image->colorspace == CMYKColorspace)) SetIndexPixelComponent(indexes+x,LevelQuantum( diff --git a/magick/fx.c b/magick/fx.c index a5a91696e..a8788026a 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -1036,7 +1036,7 @@ MagickExport Image *ColorMatrixImage(const Image *image, case 3: { if (image->matte != MagickFalse) - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange-pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); break; } case 4: diff --git a/magick/image.c b/magick/image.c index 3046a24ad..9f50e61ff 100644 --- a/magick/image.c +++ b/magick/image.c @@ -2473,8 +2473,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image, { for (x=0; x < (ssize_t) image->columns; x++) { - SetOpacityPixelComponent(q,(QuantumRange- - PixelIntensityToQuantum(q))); + SetAlphaPixelComponent(q,PixelIntensityToQuantum(q)); q++; } break; diff --git a/magick/locale.c b/magick/locale.c index 76564b6b2..b131ec44d 100644 --- a/magick/locale.c +++ b/magick/locale.c @@ -276,7 +276,7 @@ MagickExport ssize_t FormatLocaleFileList(FILE *file, n=(ssize_t) vfprintf(file,format,operands); #endif #endif - return(); + return(n); } MagickExport ssize_t FormatLocaleFile(FILE *file,const char *restrict format, diff --git a/magick/morphology.c b/magick/morphology.c index 88e558e8b..b3113221f 100644 --- a/magick/morphology.c +++ b/magick/morphology.c @@ -3230,7 +3230,7 @@ static ssize_t MorphologyPrimitive(const Image *image, Image *result_image, SetBluePixelComponent(q,ClampToQuantum(result.blue)); if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue ) - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange-result.opacity)); + SetAlphaPixelComponent(q,ClampToQuantum(result.opacity)); if ((channel & IndexChannel) != 0 && image->colorspace == CMYKColorspace) SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index)); @@ -3494,7 +3494,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if ((channel & BlueChannel) != 0) SetBluePixelComponent(q,ClampToQuantum(result.blue)); if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue ) - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange-result.opacity)); + SetAlphaPixelComponent(q,ClampToQuantum(result.opacity)); if ((channel & IndexChannel) != 0 && image->colorspace == CMYKColorspace) SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index)); @@ -3684,7 +3684,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if ((channel & BlueChannel) != 0) SetBluePixelComponent(q,ClampToQuantum(result.blue)); if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue ) - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange-result.opacity)); + SetAlphaPixelComponent(q,ClampToQuantum(result.opacity)); if ((channel & IndexChannel) != 0 && image->colorspace == CMYKColorspace) SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index)); diff --git a/magick/pixel.c b/magick/pixel.c index 748e0baf1..999b42d60 100644 --- a/magick/pixel.c +++ b/magick/pixel.c @@ -1865,7 +1865,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -1963,7 +1963,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -2043,7 +2043,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case AlphaQuantum: { - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(*p)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(*p)); break; } case OpacityQuantum: @@ -2222,8 +2222,8 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*(*p))); p++; - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*(*p))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*(*p))); p++; q++; } @@ -2292,8 +2292,8 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case AlphaQuantum: { - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*(*p))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*(*p))); break; } case OpacityQuantum: @@ -2377,8 +2377,8 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetRedPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*(*p))); p++; - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*(*p))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*(*p))); p++; q++; } @@ -2477,8 +2477,8 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*(*p))); p++; - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*(*p))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*(*p))); p++; q++; } @@ -2547,14 +2547,14 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case AlphaQuantum: { - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*(*p))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*(*p))); break; } case OpacityQuantum: { SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType) - QuantumRange*(*p))); + QuantumRange*(*p))); break; } case BlackQuantum: @@ -2620,7 +2620,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetBluePixelComponent(q,ScaleLongToQuantum(*p++)); SetGreenPixelComponent(q,ScaleLongToQuantum(*p++)); SetRedPixelComponent(q,ScaleLongToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -2698,7 +2698,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetRedPixelComponent(q,ScaleLongToQuantum(*p++)); SetGreenPixelComponent(q,ScaleLongToQuantum(*p++)); SetBluePixelComponent(q,ScaleLongToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -2758,7 +2758,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case AlphaQuantum: { - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(*p)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(*p)); break; } case OpacityQuantum: @@ -2827,7 +2827,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetBluePixelComponent(q,ScaleLongToQuantum(*p++)); SetGreenPixelComponent(q,ScaleLongToQuantum(*p++)); SetRedPixelComponent(q,ScaleLongToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -2905,7 +2905,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetRedPixelComponent(q,ScaleLongToQuantum(*p++)); SetGreenPixelComponent(q,ScaleLongToQuantum(*p++)); SetBluePixelComponent(q,ScaleLongToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -2965,7 +2965,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case AlphaQuantum: { - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(*p)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(*p)); break; } case OpacityQuantum: @@ -3034,7 +3034,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetBluePixelComponent(q,*p++); SetGreenPixelComponent(q,*p++); SetRedPixelComponent(q,*p++); - SetOpacityPixelComponent(q,QuantumRange-(*p++)); + SetAlphaPixelComponent(q,*p++); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -3112,7 +3112,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetRedPixelComponent(q,*p++); SetGreenPixelComponent(q,*p++); SetBluePixelComponent(q,*p++); - SetOpacityPixelComponent(q,QuantumRange-(*p++)); + SetAlphaPixelComponent(q,*p++); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -3172,7 +3172,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case AlphaQuantum: { - SetOpacityPixelComponent(q,QuantumRange-(*p)); + SetAlphaPixelComponent(q,*p); break; } case OpacityQuantum: @@ -3241,7 +3241,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetBluePixelComponent(q,ScaleShortToQuantum(*p++)); SetGreenPixelComponent(q,ScaleShortToQuantum(*p++)); SetRedPixelComponent(q,ScaleShortToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -3319,7 +3319,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, SetRedPixelComponent(q,ScaleShortToQuantum(*p++)); SetGreenPixelComponent(q,ScaleShortToQuantum(*p++)); SetBluePixelComponent(q,ScaleShortToQuantum(*p++)); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(*p++)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(*p++)); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -3379,7 +3379,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, } case AlphaQuantum: { - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(*p)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(*p)); break; } case OpacityQuantum: diff --git a/magick/quantum-import.c b/magick/quantum-import.c index c4c7236ef..80602b004 100644 --- a/magick/quantum-import.c +++ b/magick/quantum-import.c @@ -593,8 +593,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); pixel=(unsigned char) ((*p) & 0xf); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); p++; q++; } @@ -613,7 +612,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); p=PushCharPixel(p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -635,8 +634,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; } @@ -650,7 +649,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -674,7 +673,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); p=PushFloatPixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -688,7 +687,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); p=PushLongPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -709,7 +708,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); p=PushDoublePixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -727,8 +726,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetRGBOPixelComponents(q,image->colormap+(ssize_t) GetIndexPixelComponent(indexes+x)); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); p+=quantum_info->pad; q++; } @@ -1056,7 +1054,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushCharPixel(p,&pixel); SetRedPixelComponent(q,ScaleCharToQuantum(pixel)); p=PushCharPixel(p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1109,7 +1107,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, case 0: SetRedPixelComponent(q,quantum); break; case 1: SetGreenPixelComponent(q,quantum); break; case 2: SetBluePixelComponent(q,quantum); break; - case 3: SetOpacityPixelComponent(q,QuantumRange-quantum); break; + case 3: SetAlphaPixelComponent(q,quantum); break; } n++; } @@ -1130,8 +1128,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short) (pixel << 6))); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum( - (unsigned short) (pixel << 6))); + SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short) + (pixel << 6))); q++; } break; @@ -1155,8 +1153,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; } @@ -1171,7 +1169,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushShortPixel(endian,p,&pixel); SetRedPixelComponent(q,ScaleShortToQuantum(pixel)); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1196,7 +1194,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushFloatPixel(&quantum_state,p,&pixel); SetBluePixelComponent(q,ClampToQuantum(pixel)); p=PushFloatPixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1211,7 +1209,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushLongPixel(endian,p,&pixel); SetRedPixelComponent(q,ScaleLongToQuantum(pixel)); p=PushLongPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1233,7 +1231,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushDoublePixel(&quantum_state,p,&pixel); SetBluePixelComponent(q,ClampToQuantum(pixel)); p=PushDoublePixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1252,8 +1250,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range)); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); q++; } break; @@ -1670,8 +1667,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); pixel=(unsigned char) ((*p) & 0xf); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); p++; q++; } @@ -1689,7 +1685,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); p=PushCharPixel(p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1742,8 +1738,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; } @@ -1756,7 +1752,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1779,7 +1775,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); p=PushFloatPixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1792,7 +1788,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); p=PushLongPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1812,7 +1808,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); p=PushDoublePixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -1829,8 +1825,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetGreenPixelComponent(q,GetRedPixelComponent(q)); SetBluePixelComponent(q,GetRedPixelComponent(q)); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); p+=quantum_info->pad; q++; } @@ -2166,7 +2161,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushCharPixel(p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2182,8 +2177,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; } @@ -2192,7 +2187,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2211,7 +2206,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushFloatPixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2220,7 +2215,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushLongPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2236,7 +2231,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushDoublePixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2249,8 +2244,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, for (x=0; x < (ssize_t) number_pixels; x++) { p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); p+=quantum_info->pad; q++; } @@ -2684,7 +2678,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushCharPixel(p,&pixel); SetBluePixelComponent(q,ScaleCharToQuantum(pixel)); p=PushCharPixel(p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2758,8 +2752,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short) (pixel << 6))); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum( - (unsigned short) (pixel << 6))); + SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short) + (pixel << 6))); q++; } break; @@ -2783,8 +2777,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; } @@ -2799,7 +2793,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushShortPixel(endian,p,&pixel); SetBluePixelComponent(q,ScaleShortToQuantum(pixel)); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2824,7 +2818,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushFloatPixel(&quantum_state,p,&pixel); SetBluePixelComponent(q,ClampToQuantum(pixel)); p=PushFloatPixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2839,7 +2833,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushLongPixel(endian,p,&pixel); SetBluePixelComponent(q,ScaleLongToQuantum(pixel)); p=PushLongPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2861,7 +2855,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushDoublePixel(&quantum_state,p,&pixel); SetBluePixelComponent(q,ClampToQuantum(pixel)); p=PushDoublePixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -2880,8 +2874,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range)); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); q++; } break; @@ -3070,7 +3063,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushCharPixel(p,&pixel); SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(pixel)); p=PushCharPixel(p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -3098,8 +3091,8 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetIndexPixelComponent(indexes+x,ClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum( - (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel))); + SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType) + QuantumRange*HalfToSinglePrecision(pixel))); p+=quantum_info->pad; q++; } @@ -3116,7 +3109,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushShortPixel(endian,p,&pixel); SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(pixel)); p=PushShortPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -3143,7 +3136,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushFloatPixel(&quantum_state,p,&pixel); SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel)); p=PushFloatPixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -3160,7 +3153,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushLongPixel(endian,p,&pixel); SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(pixel)); p=PushLongPixel(endian,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleLongToQuantum(pixel)); + SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel)); p+=quantum_info->pad; q++; } @@ -3184,7 +3177,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushDoublePixel(&quantum_state,p,&pixel); SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel)); p=PushDoublePixel(&quantum_state,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ClampToQuantum(pixel)); + SetAlphaPixelComponent(q,ClampToQuantum(pixel)); p=PushDoublePixel(&quantum_state,p,&pixel); p+=quantum_info->pad; q++; @@ -3206,8 +3199,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,range)); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); - SetOpacityPixelComponent(q,QuantumRange-ScaleAnyToQuantum(pixel, - range)); + SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range)); q++; } break; diff --git a/magick/statistic.c b/magick/statistic.c index 5e83c34ef..a46fcee4c 100644 --- a/magick/statistic.c +++ b/magick/statistic.c @@ -577,8 +577,7 @@ MagickExport Image *EvaluateImages(const Image *images, SetOpacityPixelComponent(q,ClampToQuantum( evaluate_pixel[i/2].opacity)); else - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange- - evaluate_pixel[i/2].opacity)); + SetAlphaPixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].opacity)); if (evaluate_image->colorspace == CMYKColorspace) SetIndexPixelComponent(evaluate_indexes+i,ClampToQuantum( evaluate_pixel[i/2].index)); @@ -697,8 +696,7 @@ MagickExport Image *EvaluateImages(const Image *images, if (evaluate_image->matte == MagickFalse) SetOpacityPixelComponent(q,ClampToQuantum(evaluate_pixel[x].opacity)); else - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange- - evaluate_pixel[x].opacity)); + SetAlphaPixelComponent(q,ClampToQuantum(evaluate_pixel[x].opacity)); if (evaluate_image->colorspace == CMYKColorspace) SetIndexPixelComponent(evaluate_indexes+x,ClampToQuantum( evaluate_pixel[x].index)); @@ -805,9 +803,8 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image, SetOpacityPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator( random_info[id],GetOpacityPixelComponent(q),op,value))); else - SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange- - ApplyEvaluateOperator(random_info[id],(Quantum) - GetAlphaPixelComponent(q),op,value))); + SetAlphaPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator( + random_info[id],(Quantum) GetAlphaPixelComponent(q),op,value))); } if (((channel & IndexChannel) != 0) && (indexes != (IndexPacket *) NULL)) SetIndexPixelComponent(indexes+x,ClampToQuantum(ApplyEvaluateOperator( @@ -1042,7 +1039,7 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image, GetOpacityPixelComponent(q),function,number_parameters,parameters, exception)); else - SetOpacityPixelComponent(q,QuantumRange-ApplyFunction((Quantum) + SetAlphaPixelComponent(q,ApplyFunction((Quantum) GetAlphaPixelComponent(q),function,number_parameters,parameters, exception)); }