Changed signature of ConformPixelInfo.

[imagemagick] / coders / null.c

diff --git a/coders/null.c b/coders/null.c
index afa70966154c1c322fea60690b663a70dc25c733..6859c5e2a636f93df7865a35746ee0b8db8eeb9d 100644 (file)
--- a/coders/null.c
+++ b/coders/null.c
@@ -13,11 +13,11 @@
 %                    Read/Write Image Of Uniform Color.                       %
 %                                                                             %
 %                              Software Design                                %
-%                                John Cristy                                  %
+%                                   Cristy                                    %
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -126,11 +126,9 @@ static Image *ReadNULLImage(const ImageInfo *image_info,
     image->columns=1;
   if (image->rows == 0)
     image->rows=1;
-  image->matte=MagickTrue;
-  GetPixelInfo(image,&background);
-  background.alpha=(MagickRealType) TransparentAlpha;
-  if (image->colorspace == CMYKColorspace)
-    ConvertsRGBToCMYK(&background);
+  ConformPixelInfo(image,&image->background_color,&background,exception);
+  image->alpha_trait=BlendPixelTrait;
+  background.alpha=(double) TransparentAlpha;
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);