(no commit message)

diff --git a/coders/pict.c b/coders/pict.c
index 26b8793974701be7d41b7b7cd0b5ae22eb0748c2..d8b953648612c611bb94f39d8a2b7e863831cdbb 100644 (file)
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1672,9 +1672,9 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
   storage_class=image->storage_class;
   if (image_info->compression == JPEGCompression)
     storage_class=DirectClass;
-  if ((storage_class == DirectClass) || (image->alpha_trait == BlendPixelTrait))
+  if (storage_class == DirectClass)
     {
-      pixmap.component_count=image->alpha_trait ? 4 : 3;
+      pixmap.component_count=image->alpha_trait == BlendPixelTrait ? 4 : 3;
       pixmap.pixel_type=16;
       pixmap.bits_per_pixel=32;
       pixmap.pack_type=0x04;
@@ -1685,8 +1685,8 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
     Allocate memory.
   */
   bytes_per_line=image->columns;
-  if ((storage_class == DirectClass) || (image->alpha_trait == BlendPixelTrait))
-    bytes_per_line*=image->alpha_trait ? 4 : 3;
+  if (storage_class == DirectClass)
+    bytes_per_line*=image->alpha_trait == BlendPixelTrait ? 4 : 3;
   buffer=(unsigned char *) AcquireQuantumMemory(PictInfoSize,sizeof(*buffer));
   packed_scanline=(unsigned char *) AcquireQuantumMemory((size_t)
    (row_bytes+MaxCount),sizeof(*packed_scanline));
@@ -1909,7 +1909,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
     Write picture data.
   */
   count=0;
-  if ((storage_class == PseudoClass) && (image->alpha_trait != BlendPixelTrait))
+  if (storage_class == PseudoClass)
     for (y=0; y < (ssize_t) image->rows; y++)
     {
       p=GetVirtualPixels(image,0,y,image->columns,1,exception);

diff --git a/tests/validate.h b/tests/validate.h
index b08c714b4cfd1f9a5e49f3c1bf5b9206035dca39..27a69fa380ac97f3145b19a8aa2419e77ac82f38 100644 (file)
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -297,9 +297,7 @@ static const struct ReferenceFormats
     { "PFM", UndefinedCompression, 0.004 },
     { "PGM", UndefinedCompression, 0.0 },
     { "PGX", UndefinedCompression, 0.0 },
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
     { "PICT", UndefinedCompression, 0.004 },
-#endif
     { "PIX", UndefinedCompression, 0.0 },
     { "PJPEG", UndefinedCompression, 0.004 },
     { "PLASMA", UndefinedCompression, 0.0 },