diff options
Diffstat (limited to 'coders/cut.c')
| -rw-r--r-- | coders/cut.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/coders/cut.c b/coders/cut.c index 6bbc56f64..7b5380262 100644 --- a/coders/cut.c +++ b/coders/cut.c @@ -117,7 +117,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image) for (bit=0; bit < 8; bit++) { index=(IndexPacket) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00); - SetIndexPixelComponent(indexes+x+bit,index); + SetPixelIndex(indexes+x+bit,index); } p++; } @@ -126,7 +126,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image) for (bit=0; bit < (image->columns % 8); bit++) { index=(IndexPacket) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00); - SetIndexPixelComponent(indexes+x+bit,index); + SetPixelIndex(indexes+x+bit,index); } p++; } @@ -143,29 +143,29 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image) for (x=0; x < ((ssize_t) image->columns-1); x+=2) { index=ConstrainColormapIndex(image,(*p >> 6) & 0x3); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); index=ConstrainColormapIndex(image,(*p >> 4) & 0x3); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); index=ConstrainColormapIndex(image,(*p >> 2) & 0x3); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); index=ConstrainColormapIndex(image,(*p) & 0x3); - SetIndexPixelComponent(indexes+x+1,index); + SetPixelIndex(indexes+x+1,index); p++; } if ((image->columns % 4) != 0) { index=ConstrainColormapIndex(image,(*p >> 6) & 0x3); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); if ((image->columns % 4) >= 1) { index=ConstrainColormapIndex(image,(*p >> 4) & 0x3); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); if ((image->columns % 4) >= 2) { index=ConstrainColormapIndex(image,(*p >> 2) & 0x3); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); } } p++; @@ -184,15 +184,15 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image) for (x=0; x < ((ssize_t) image->columns-1); x+=2) { index=ConstrainColormapIndex(image,(*p >> 4) & 0xf); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); index=ConstrainColormapIndex(image,(*p) & 0xf); - SetIndexPixelComponent(indexes+x+1,index); + SetPixelIndex(indexes+x+1,index); p++; } if ((image->columns % 2) != 0) { index=ConstrainColormapIndex(image,(*p >> 4) & 0xf); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); p++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -207,7 +207,7 @@ static void InsertRow(ssize_t depth,unsigned char *p,ssize_t y,Image *image) for (x=0; x < (ssize_t) image->columns; x++) { index=ConstrainColormapIndex(image,*p); - SetIndexPixelComponent(indexes+x,index); + SetPixelIndex(indexes+x,index); p++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -245,8 +245,8 @@ static int GetCutColors(Image *image) q=GetAuthenticPixels(image,0,y,image->columns,1,exception); for (x=0; x < (ssize_t) image->columns; x++) { - if (intensity < GetRedPixelComponent(q)) - intensity=GetRedPixelComponent(q); + if (intensity < GetPixelRed(q)) + intensity=GetPixelRed(q); if (intensity >= scale_intensity) return(255); q++; @@ -573,11 +573,11 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception) q=QueueAuthenticPixels(image,0,i,image->columns,1,exception); for (j=0; j < (ssize_t)image->columns; j++) { - if (GetRedPixelComponent(q) == ScaleCharToQuantum(1)) + if (GetPixelRed(q) == ScaleCharToQuantum(1)) { - SetRedPixelComponent(q,QuantumRange); - SetGreenPixelComponent(q,QuantumRange); - SetBluePixelComponent(q,QuantumRange); + SetPixelRed(q,QuantumRange); + SetPixelGreen(q,QuantumRange); + SetPixelBlue(q,QuantumRange); } q++; } |