(no commit message)

[imagemagick] / MagickCore / stream.c

diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index ee3a483f147bdbcd198b0fe3ce0f522d9acc0c5d..d29bc4209b9d8b6eaa660eff79995afc120fd570 100644 (file)
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -708,7 +708,7 @@ static const Quantum *GetVirtualPixelStream(const Image *image,
     Pixels are stored in a temporary buffer until they are synced to the cache.
   */
   number_pixels=(MagickSizeType) columns*rows;
-  length=(size_t) number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+  length=(size_t) number_pixels*cache_info->number_channels*sizeof(Quantum);
   if (cache_info->metacontent_extent != 0)
     length+=number_pixels*cache_info->metacontent_extent;
   if (cache_info->pixels == (Quantum *) NULL)
@@ -736,7 +736,7 @@ static const Quantum *GetVirtualPixelStream(const Image *image,
   cache_info->metacontent=(void *) NULL;
   if (cache_info->metacontent_extent != 0)
     cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
-      cache_info->pixel_channels);
+      cache_info->number_channels);
   return(cache_info->pixels);
 }
 \f
@@ -867,7 +867,7 @@ static Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
   cache_info->columns=columns;
   cache_info->rows=rows;
   number_pixels=(MagickSizeType) columns*rows;
-  length=(size_t) number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+  length=(size_t) number_pixels*cache_info->number_channels*sizeof(Quantum);
   if (cache_info->metacontent_extent != 0)
     length+=number_pixels*cache_info->metacontent_extent;
   if (cache_info->pixels == (Quantum *) NULL)
@@ -887,7 +887,7 @@ static Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
   cache_info->metacontent=(void *) NULL;
   if (cache_info->metacontent_extent != 0)
     cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
-      cache_info->pixel_channels);
+      cache_info->number_channels);
   return(cache_info->pixels);
 }
 \f
@@ -2695,7 +2695,7 @@ MagickExport MagickBooleanType WriteStream(const ImageInfo *image_info,
   assert(image->signature == MagickSignature);
   write_info=CloneImageInfo(image_info);
   write_info->stream=stream;
-  status=WriteImage(write_info,image);
+  status=WriteImage(write_info,image,&image->exception);
   write_info=DestroyImageInfo(write_info);
   return(status);
 }