Changeset 1267

Timestamp:

02/19/10 12:49:50 (3 years ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• coders/tiff.c (modified) (1 diff)
• magick/transform.c (modified) (1 diff)

ImageMagick/trunk/coders/tiff.c

@@ -1066 +1066 @@
       }
     else
-      {
-        if (samples_per_pixel > 3)
+      for (i=0; i < extra_samples; i++)
+      {
+        if (sample_info[i] == EXTRASAMPLE_UNASSALPHA)
           {
             image->matte=MagickTrue;
             associated_alpha=MagickFalse;
           }
-        if (sample_info[0] == EXTRASAMPLE_UNASSALPHA)
-          {
-            image->matte=MagickTrue;
-            associated_alpha=MagickFalse;
-          }
-        if (sample_info[0] == EXTRASAMPLE_ASSOCALPHA)
+        if (sample_info[i] == EXTRASAMPLE_ASSOCALPHA)
           {
             image->matte=MagickTrue;

ImageMagick/trunk/magick/transform.c

@@ -625 +625 @@
         continue;
       }
+    indexes=GetCacheViewVirtualIndexQueue(image_view);
+    crop_indexes=GetCacheViewAuthenticIndexQueue(crop_view);
     (void) CopyMagickMemory(q,p,(size_t) crop_image->columns*sizeof(*q));
-    indexes=GetCacheViewVirtualIndexQueue(image_view);
-    if (indexes != (IndexPacket *) NULL)
-      {
-        crop_indexes=GetCacheViewAuthenticIndexQueue(crop_view);
-        if (crop_indexes != (IndexPacket *) NULL)
-          (void) CopyMagickMemory(crop_indexes,indexes,(size_t)
-            crop_image->columns*sizeof(*crop_indexes));
-      }
+    if ((indexes != (IndexPacket *) NULL) &&
+        (crop_indexes != (IndexPacket *) NULL))
+      (void) CopyMagickMemory(crop_indexes,indexes,(size_t) crop_image->columns*
+        sizeof(*crop_indexes));
     if (SyncCacheViewAuthenticPixels(crop_view,exception) == MagickFalse)
       status=MagickFalse;