(no commit message)

diff --git a/coders/aai.c b/coders/aai.c
index eeefdaacc76b0029e93c8dcbade22f84a7a77305..abdb288e97edc7fa36de6343b2c91b15f45b86b0 100644 (file)
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -172,11 +172,11 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception)
         break;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        q->red=ScaleCharToQuantum(*p++);
-        q->green=ScaleCharToQuantum(*p++);
         q->blue=ScaleCharToQuantum(*p++);
-        if (*p == 254)
-          *p=255;
+        q->green=ScaleCharToQuantum(*p++);
+        q->red=ScaleCharToQuantum(*p++);
+        if (*p == 0)
+          *p=1;
         q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p));
         if (q->opacity != OpaqueOpacity)
           image->matte=MagickTrue;
@@ -374,9 +374,9 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image)
       q=pixels;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
-        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
-        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
         *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+        *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
+        *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
         *q=ScaleQuantumToChar((Quantum) (QuantumRange-
           (image->matte != MagickFalse ? p->opacity : OpaqueOpacity)));
         if (*q == 255)