]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Mon, 26 Jan 2015 20:37:16 +0000 (20:37 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Mon, 26 Jan 2015 20:37:16 +0000 (20:37 +0000)
coders/bgr.c
coders/cmyk.c
coders/gray.c
coders/raw.c
coders/rgb.c
coders/ycbcr.c

index cec2a4c5adb16eefa8cb8313eed8196c15aca1ec..97d5fd5a7e84b9b5fb8edc7657911773167a419d 100644 (file)
@@ -170,7 +170,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
       quantum_type=BGRAQuantum;
       image->alpha_trait=BlendPixelTrait;
     }
-  pixels=NULL;
+  pixels=(const void *) NULL;
   if (image_info->number_scenes != 0)
     while (image->scene < image_info->scene)
     {
index 972d9889400ef0e93ec3a1ae0b58f0d333e994a3..54c0a9bc2033d92bf0e34daea1aeb071183cdf47 100644 (file)
@@ -170,7 +170,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
       quantum_type=CMYKAQuantum;
       image->alpha_trait=BlendPixelTrait;
     }
-  pixels=NULL;
+  pixels=(const void *) NULL;
   if (image_info->number_scenes != 0)
     while (image->scene < image_info->scene)
     {
index f7b49b7745cbf9012c9c1cdc7ada36d9b9aaf7c9..6fa7f98ecfa85268d8ae49416ddba2589a017fea 100644 (file)
@@ -160,6 +160,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+  pixels=(const void *) NULL;
   if (image_info->number_scenes != 0)
     while (image->scene < image_info->scene)
     {
@@ -179,7 +180,6 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
   scene=0;
   count=0;
   length=0;
-  pixels=(const void *) NULL;
   do
   {
     /*
index 74573b8f5603d9ce383df038d4470b07778b5c41..785dd041b7ed388260012842e3262e697122a453 100644 (file)
@@ -155,6 +155,7 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception)
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+  pixels=(const void *) NULL;
   if (image_info->number_scenes != 0)
     while (image->scene < image_info->scene)
     {
@@ -174,7 +175,6 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception)
   scene=0;
   count=0;
   length=0;
-  pixels=(const void *) NULL;
   do
   {
     /*
index c15487d33fc72fba911fbb40b051387b39b0a6ce..20b982f13a2f436a362a327c4470124f0f79052b 100644 (file)
@@ -175,7 +175,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       quantum_type=RGBOQuantum;
       canvas_image->alpha_trait=BlendPixelTrait;
     }
-  pixels=NULL;
+  pixels=(const void *) NULL;
   if (image_info->number_scenes != 0)
     while (image->scene < image_info->scene)
     {
index 4f2c4b28c8d0b77953ceadaa27d87f8e1db2ac05..092da6494208aa49fe5afefe39716dc566c7438b 100644 (file)
@@ -180,7 +180,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
       quantum_type=RGBAQuantum;
       image->alpha_trait=BlendPixelTrait;
     }
-  pixels=NULL;
+  pixels=(const void *) NULL;
   if (image_info->number_scenes != 0)
     while (image->scene < image_info->scene)
     {