(no commit message)

diff --git a/coders/tga.c b/coders/tga.c
index 2ea86ce35dde454e78f20a5cfc6d7559e36c1d48..a601c193bd16f73d5ec5d659ca3131c35c86bc5f 100644 (file)
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -444,11 +444,11 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ThrowReaderException(CorruptImageError,"UnableToReadImageData");
       if (image->storage_class == PseudoClass)
         indexes[x]=index;
-      q->red=pixel.red;
-      q->green=pixel.green;
-      q->blue=pixel.blue;
+      SetRedPixelComponent(q,GetRedPixelComponent(&pixel));
+      SetGreenPixelComponent(q,GetGreenPixelComponent(&pixel));
+      SetBluePixelComponent(q,GetBluePixelComponent(&pixel));
       if (image->matte != MagickFalse)
-        q->opacity=pixel.opacity;
+        SetOpacityPixelComponent(q,GetOpacityPixelComponent(&pixel));
       q++;
     }
     if (((unsigned char) (tga_info.attributes & 0xc0) >> 6) == 4)

diff --git a/magick/draw.c b/magick/draw.c
index 6db36d93307bd6f8cadfe2fde0c639a1badfa354..5646e34b82f1d3054e8a6cbcdf3497ffbe9a3ad0 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -4288,7 +4288,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           if (q == (PixelPacket *) NULL)
             break;
           (void) GetFillColor(draw_info,x,y,&pixel);
-          q->opacity=pixel.opacity;
+          SetOpacityPixelComponent(q,GetOpacityPixelComponent(&pixel));
           (void) SyncCacheViewAuthenticPixels(image_view,exception);
           break;
         }
@@ -4322,7 +4322,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
                   continue;
                 }
               (void) GetFillColor(draw_info,x,y,&pixel);
-              q->opacity=pixel.opacity;
+              SetOpacityPixelComponent(q,GetOpacityPixelComponent(&pixel));
               q++;
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -4372,7 +4372,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
             for (x=0; x < (ssize_t) image->columns; x++)
             {
               (void) GetFillColor(draw_info,x,y,&pixel);
-              q->opacity=pixel.opacity;
+              SetOpacityPixelComponent(q,GetOpacityPixelComponent(&pixel));
               q++;
             }
             sync=SyncCacheViewAuthenticPixels(image_view,exception);

diff --git a/magick/effect.c b/magick/effect.c
index 65d3ff6f6a40872cdce58a8d6a4cbf6d0a766f74..321efaa2bd3927c0584722f5a4f4d9b49845e9b3 100644 (file)
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -359,11 +359,14 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image,
       }
       gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
       if ((channel & RedChannel) != 0)
-        q->red=ClampToQuantum(gamma*GetRedPixelComponent(&pixel));
+        SetRedPixelComponent(q,ClampToQuantum(gamma*
+          GetRedPixelComponent(&pixel)));
       if ((channel & GreenChannel) != 0)
-        q->green=ClampToQuantum(gamma*GetGreenPixelComponent(&pixel));
+        SetGreenPixelComponent(q,ClampToQuantum(gamma*
+          GetGreenPixelComponent(&pixel)));
       if ((channel & BlueChannel) != 0)
-        q->blue=ClampToQuantum(gamma*GetBluePixelComponent(&pixel));
+        SetBluePixelComponent(q,ClampToQuantum(gamma*
+          GetBluePixelComponent(&pixel)));
       if ((channel & OpacityChannel) != 0)
         SetOpacityPixelComponent(q,ClampOpacityPixelComponent(&pixel));
       if (((channel & IndexChannel) != 0) &&

diff --git a/magick/image.c b/magick/image.c
index f5aaa892283c6def18685878bad56524eb8f1682..dabfc11b36637bc06fab5a51d5fa68a215723542 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -2373,8 +2373,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q->green=q->red;
-          q->blue=q->red;
+          SetGreenPixelComponent(q,GetRedPixelComponent(q));
+          SetBluePixelComponent(q,GetRedPixelComponent(q));
           q++;
         }
         break;
@@ -2383,8 +2383,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q->red=q->green;
-          q->blue=q->green;
+          SetRedPixelComponent(q,GetGreenPixelComponent(q));
+          SetBluePixelComponent(q,GetGreenPixelComponent(q));
           q++;
         }
         break;
@@ -2393,8 +2393,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q->red=q->blue;
-          q->green=q->blue;
+          SetRedPixelComponent(q,GetBluePixelComponent(q));
+          SetGreenPixelComponent(q,GetBluePixelComponent(q));
           q++;
         }
         break;
@@ -2403,9 +2403,9 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q->red=q->opacity;
-          q->green=q->opacity;
-          q->blue=q->opacity;
+          SetRedPixelComponent(q,GetOpacityPixelComponent(q));
+          SetGreenPixelComponent(q,GetOpacityPixelComponent(q));
+          SetBluePixelComponent(q,GetOpacityPixelComponent(q));
           q++;
         }
         break;
@@ -2417,9 +2417,9 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q->red=indexes[x];
-          q->green=indexes[x];
-          q->blue=indexes[x];
+          SetRedPixelComponent(q,indexes[x]);
+          SetGreenPixelComponent(q,indexes[x]);
+          SetBluePixelComponent(q,indexes[x]);
           q++;
         }
         break;
@@ -2428,9 +2428,9 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q->red=(Quantum) GetAlphaPixelComponent(q);
-          q->green=(Quantum) GetAlphaPixelComponent(q);
-          q->blue=(Quantum) GetAlphaPixelComponent(q);
+          SetRedPixelComponent(q,(Quantum) GetAlphaPixelComponent(q));
+          SetGreenPixelComponent(q,(Quantum) GetAlphaPixelComponent(q));
+          SetBluePixelComponent(q,(Quantum) GetAlphaPixelComponent(q));
           q++;
         }
         break;
@@ -2439,7 +2439,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
       {
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          q->opacity=(Quantum) (QuantumRange-PixelIntensityToQuantum(q));
+          SetOpacityPixelComponent(q,(Quantum) (QuantumRange-
+            PixelIntensityToQuantum(q)));
           q++;
         }
         break;
@@ -2658,9 +2659,9 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
         {
           if (q->opacity == TransparentOpacity)
             {
-              q->red=pixel.red;
-              q->green=pixel.green;
-              q->blue=pixel.blue;
+              SetRedPixelComponent(q,GetRedPixelComponent(&pixel));
+              SetGreenPixelComponent(q,GetGreenPixelComponent(&pixel));
+              SetBluePixelComponent(q,GetBluePixelComponent(&pixel));
             }
           q++;
         }
@@ -4232,14 +4233,13 @@ MagickExport MagickBooleanType SyncImage(Image *image)
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      index=PushColormapIndex(image,(size_t) indexes[x],
-        &range_exception);
+      index=PushColormapIndex(image,(size_t) indexes[x],&range_exception);
       pixel=image->colormap[(ssize_t) index];
-      q->red=pixel.red;
-      q->green=pixel.green;
-      q->blue=pixel.blue;
+      SetRedPixelComponent(q,GetRedPixelComponent(&pixel));
+      SetGreenPixelComponent(q,GetGreenPixelComponent(&pixel));
+      SetBluePixelComponent(q,GetBluePixelComponent(&pixel));
       if (image->matte != MagickFalse)
-        q->opacity=pixel.opacity;
+        SetOpacityPixelComponent(q,GetOpacityPixelComponent(&pixel));
       q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)

diff --git a/magick/token.c b/magick/token.c
index 5a6b61cfbb8c1ce5a9f4c81be6d1c4e70b4f40ba..517b848da45312a9628e0869253448bec81a507c 100644 (file)
--- a/magick/token.c
+++ b/magick/token.c
@@ -236,7 +236,7 @@ MagickExport void GetMagickToken(const char *start,const char **end,char *token)
               token[i++]=(*p++);
             break;
           }
-        if ((isalpha((int) ((unsigned char) *p)) == 0) &&
+        if ((*p != '\0') && (isalpha((int) ((unsigned char) *p)) == 0) &&
             (*p != *DirectorySeparator) && (*p != '#') && (*p != '<'))
           {
             token[i++]=(*p++);