(no commit message)

diff --git a/coders/icon.c b/coders/icon.c
index 7c01fb2561c349c60c720660a9b440cbac8354e2..db7b5ce2b48481df3698be19c16382c323fdf6aa 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -314,10 +314,10 @@ static Image *ReadICONImage(const ImageInfo *image_info,
         icon_info.colors_important=ReadBlobLSBLong(image);
         image->matte=MagickTrue;
         image->columns=(unsigned long) icon_file.directory[i].width;
-        if (image->columns > icon_info.width)
+        if ((long) image->columns > icon_info.width)
           image->columns=(unsigned long) icon_info.width;
         image->rows=(unsigned long) icon_file.directory[i].height;
-        if (image->rows > icon_info.height)
+        if ((long) image->rows > icon_info.height)
           image->rows=(unsigned long) icon_info.height;
         image->depth=8;
         if (image->debug != MagickFalse)

diff --git a/coders/ps.c b/coders/ps.c
index 8981538bfebe65086cbf8034e13a16f3228e53ba..cc6c747d9da2c4c6575be97558a5c6a0bd4558a7 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1513,7 +1513,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image)
             */
             (void) WriteBlobString(image,"\n%begin_xml_code\n");
             (void) FormatMagickString(buffer,MaxTextExtent,
-               "\n%%begin_xml_packet: %ld\n",GetStringInfoLength(profile));
+               "\n%%begin_xml_packet: %lu\n",(unsigned long)
+               GetStringInfoLength(profile));
             (void) WriteBlobString(image,buffer);
             for (i=0; i < (long) GetStringInfoLength(profile); i++)
               (void) WriteBlobByte(image,GetStringInfoDatum(profile)[i]);

diff --git a/coders/psd.c b/coders/psd.c
index d2857ef294a273d1dec6bcb93335d6fd478f4249..d7d23dede97801bb949a7016747a89fd3e6df152 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1035,7 +1035,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 if (image->debug != MagickFalse)
                   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                     "      unsupported data: length=%ld",(long)
-                    size-combinedlength);
+                    (size-combinedlength));
                 for (j=0; j < (long) (size-combinedlength); j++)
                   (void) ReadBlobByte(image);
               }

diff --git a/coders/tiff.c b/coders/tiff.c
index b3c92d3a004bca49f1723766b552ebfa1452b774..2bc6b60e620e0b99f006bb554d7ebaa143c1be7d 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1066,17 +1066,16 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       for (i=0; i < extra_samples; i++)
       {
         image->matte=MagickTrue;
-        image->alpha_channel=UndefinedAlphaChannel;
         (void) SetImageProperty(image,"tiff:alpha","undefined");
+        SetQuantumAlphaType(quantum_info,UndefinedQuantumAlpha);
         if (sample_info[i] == EXTRASAMPLE_UNASSALPHA)
           {
-            image->alpha_channel=UnassociatedAlphaChannel;
+            SetQuantumAlphaType(quantum_info,DisassociatedQuantumAlpha);
             (void) SetImageProperty(image,"tiff:alpha","unassociated");
           }
         if (sample_info[i] == EXTRASAMPLE_ASSOCALPHA)
           {
-            image->alpha_channel=AssociatedAlphaChannel;
-            SetQuantumAlphaType(quantum_info,DisassociatedQuantumAlpha);
+            SetQuantumAlphaType(quantum_info,AssociatedQuantumAlpha);
             (void) SetImageProperty(image,"tiff:alpha","associated");
           }
       }

diff --git a/magick/image.c b/magick/image.c
index 0d64024b03e061025d4a53d9c0d0459f7e4c9503..8759d63f45bd89625050d142c168d2274ad64ad7 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -828,7 +828,6 @@ MagickExport Image *CloneImage(const Image *image,const unsigned long columns,
   clone_image->signature=MagickSignature;
   clone_image->storage_class=image->storage_class;
   clone_image->colorspace=image->colorspace;
-  clone_image->alpha_channel=image->alpha_channel;
   clone_image->matte=image->matte;
   clone_image->columns=image->columns;
   clone_image->rows=image->rows;
@@ -2761,8 +2760,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       break;
     }
     case UndefinedAlphaChannel:
-    case AssociatedAlphaChannel:
-    case UnassociatedAlphaChannel:
       break;
   }
   return(status);

diff --git a/magick/image.h b/magick/image.h
index 0d2245472de5a4bfb5c721b7ba2841274bc5fd3c..ef370ce683a62908118257c19cd2f50c06210119 100644 (file)
--- a/magick/image.h
+++ b/magick/image.h
@@ -30,8 +30,6 @@ extern "C" {
 typedef enum
 {
   UndefinedAlphaChannel,
-  AssociatedAlphaChannel,
-  UnassociatedAlphaChannel,
   ActivateAlphaChannel,
   BackgroundAlphaChannel,
   CopyAlphaChannel,
@@ -335,9 +333,6 @@ struct _Image
 
   MagickSizeType
     extent;
-
-  AlphaChannelType
-    alpha_channel;
 };
 
 struct _ImageInfo

diff --git a/magick/quantum-export.c b/magick/quantum-export.c
index 08c82c5d15a2431586a9996408a5b11bb6e71013..880348c6296dab2f9e486db8a7a96ab1588e4ac8 100644 (file)
--- a/magick/quantum-export.c
+++ b/magick/quantum-export.c
@@ -1999,8 +1999,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopCharPixel(pixel,q);
             pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
             q=PopCharPixel(pixel,q);
-            pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+            pixel=ScaleQuantumToChar(GetAlphaPixelComponent(p));
             q=PopCharPixel(pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2041,8 +2040,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopShortPixel(endian,pixel,q);
             pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
             q=PopShortPixel(endian,pixel,q);
-            pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+            pixel=ScaleQuantumToShort(GetAlphaPixelComponent(p));
             q=PopShortPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2064,7 +2062,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 q=PopFloatPixel(&quantum_state,(float) p->red,q);
                 q=PopFloatPixel(&quantum_state,(float) p->green,q);
                 q=PopFloatPixel(&quantum_state,(float) p->blue,q);
-                pixel=(float) (GetAlphaPixelComponent(p));
+                pixel=GetAlphaPixelComponent(p);
                 q=PopFloatPixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2079,8 +2077,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
             q=PopLongPixel(endian,pixel,q);
             pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
             q=PopLongPixel(endian,pixel,q);
-            pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
-              GetOpacityPixelComponent(p)));
+            pixel=ScaleQuantumToLong(GetAlphaPixelComponent(p));
             q=PopLongPixel(endian,pixel,q);
             p++;
             q+=quantum_info->pad;
@@ -2099,7 +2096,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
                 q=PopDoublePixel(&quantum_state,(double) p->red,q);
                 q=PopDoublePixel(&quantum_state,(double) p->green,q);
                 q=PopDoublePixel(&quantum_state,(double) p->blue,q);
-                pixel=(double) (GetAlphaPixelComponent(p));
+                pixel=(double) GetAlphaPixelComponent(p);
                 q=PopDoublePixel(&quantum_state,pixel,q);
                 p++;
                 q+=quantum_info->pad;
@@ -2113,13 +2110,13 @@ MagickExport size_t ExportQuantumPixels(const Image *image,
           for (x=0; x < (long) number_pixels; x++)
           {
             q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
-              p->red,range),q);
+              GetRedPixelComponent(p),range),q);
             q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
-              p->green,range),q);
+              GetGreenPixelComponent(p),range),q);
             q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
-              p->blue,range),q);
+              GetBluePixelComponent(p),range),q);
             q=PopQuantumPixel(&quantum_state,image->depth,ScaleQuantumToAny(
-              (Quantum) (GetAlphaPixelComponent(p)),range),q);
+              GetAlphaPixelComponent(p),range),q);
             p++;
             q+=quantum_info->pad;
           }

diff --git a/tests/validate.h b/tests/validate.h
index 3bc1266e7fa31321134e71b06dc47b34f0f926f3..2eba3888ef218f64a8913071cff02e8afff39df1 100644 (file)
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -317,7 +317,7 @@ static const struct ReferenceFormats
     { "RAS", UndefinedCompression, 0.0 },
     { "RGB", UndefinedCompression, 0.0 },
     { "RGBA", UndefinedCompression, 0.003 },
-    { "RGBO", UndefinedCompression, 0.0 },
+    { "RGBO", UndefinedCompression, 0.003 },
     { "RLA", UndefinedCompression, 0.0 },
     { "RLE", UndefinedCompression, 0.0 },
     { "SCR", UndefinedCompression, 0.0 },