Changeset 7100 for ImageMagick/trunk/MagickCore/channel.c

Timestamp:

03/13/12 09:01:27 (14 months ago)

Author:

cristy

Message:

 

File:

• ImageMagick/trunk/MagickCore/channel.c (modified) (5 diffs)

ImageMagick/trunk/MagickCore/channel.c

@@ -242 +242 @@
   GetMagickToken(p,&p,token);
   channel_op=ExtractChannelOp;
-  for (channels=0; *p != '\0'; )
+  for (channels=0; *token != '\0'; )
   {
     ssize_t
@@ -268 +268 @@
           *canvas;
 
+        if ((channel_op == ExtractChannelOp) && (channels == 1))
+          {
+            destination_image->colorspace=GRAYColorspace;
+            InitializePixelChannelMap(destination_image);
+          }
         status=SetImageStorageClass(destination_image,DirectClass,exception);
         if (status == MagickFalse)
@@ -273 +278 @@
             destination_image=DestroyImageList(destination_image);
             return(destination_image);
-          }
-        if ((channel_op == ExtractChannelOp) && (channels == 1))
-          {
-            destination_image->colorspace=GRAYColorspace;
-            InitializePixelChannelMap(destination_image);
           }
         canvas=CloneImage(source_image,0,0,MagickTrue,exception);
@@ -371 +371 @@
       break;
   }
+  if ((channel_op == ExtractChannelOp) && (channels == 1))
+    {
+      destination_image->colorspace=GRAYColorspace;
+      InitializePixelChannelMap(destination_image);
+    }
   status=SetImageStorageClass(destination_image,DirectClass,exception);
   if (status == MagickFalse)
@@ -377 +382 @@
       return((Image *) NULL);
     }
-  if ((channel_op == ExtractChannelOp) && (channels == 1))
-    {
-      destination_image->colorspace=GRAYColorspace;
-      InitializePixelChannelMap(destination_image);
-    }
-  return(destination_image);
+  return(GetFirstImageInList(destination_image));
 }