Changeset 11587 for ImageMagick/trunk

Timestamp:

07/07/08 15:48:00 (3 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/PerlMagick/Magick.xs (modified) (2 diffs)

ImageMagick/trunk/PerlMagick/Magick.xs

@@ -11896 +11896 @@
     (void) SetImageStorageClass(image,DirectClass);
     q=GetImagePixels(image,region.x,region.y,1,1);
-    if (q == (const PixelPacket *) NULL)
+    if ((q == (const PixelPacket *) NULL) || (av == (AV *) NULL))
       PUSHs(&sv_undef);
     else
@@ -11911 +11911 @@
         if (normalize != MagickFalse)
           scale=QuantumRange;
-        if ((channel & RedChannel) != 0)
-          q->red=RoundToQuantum(QuantumRange* SvNV(*(av_fetch(av,i,0))));
-        if ((channel & GreenChannel) != 0)
-          q->green=RoundToQuantum(QuantumRange* SvNV(*(av_fetch(av,i,0))));
-        if ((channel & BlueChannel) != 0)
-          q->blue=RoundToQuantum(QuantumRange* SvNV(*(av_fetch(av,i,0))));
-        if (((channel & IndexChannel) != 0) &&
-            (image->colorspace == CMYKColorspace))
-          *indexes=RoundToQuantum(QuantumRange* SvNV(*(av_fetch(av,i,0))));
-        if ((channel & OpacityChannel) != 0)
-          q->opacity=RoundToQuantum(QuantumRange* SvNV(*(av_fetch(av,i,0))));
+        if (((channel & RedChannel) != 0) && (i < av_len(av)))
+          {
+            q->red=RoundToQuantum(QuantumRange*SvNV(*(av_fetch(av,i,0))));
+            i++;
+          }
+        if (((channel & GreenChannel) != 0) && (i < av_len(av)))
+          {
+            q->green=RoundToQuantum(QuantumRange*SvNV(*(av_fetch(av,i,0))));
+            i++;
+          }
+        if (((channel & BlueChannel) != 0) && (i < av_len(av)))
+          {
+            q->blue=RoundToQuantum(QuantumRange*SvNV(*(av_fetch(av,i,0))));
+            i++;
+          }
+        if ((((channel & IndexChannel) != 0) &&
+            (image->colorspace == CMYKColorspace)) && (i < av_len(av)))
+          {
+            *indexes=RoundToQuantum(QuantumRange*SvNV(*(av_fetch(av,i,0))));
+            i++;
+          }
+        if (((channel & OpacityChannel) != 0) && (i < av_len(av)))
+          {
+            q->opacity=RoundToQuantum(QuantumRange*SvNV(*(av_fetch(av,i,0))));
+            i++;
+          }
         (void) SyncImagePixels(image);
       }