(no commit message)

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 52e32bee143e02a5e7d59bcb778e12e537203d92..dd600ace06bfc7b4cc770a6813c953735399de98 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -91,6 +91,12 @@ static inline PixelChannel GetPixelChannelMapChannel(
   return(image->channel_map[offset].channel);
 }
 
+static inline int GetPixelChannelMapOffset(const Image *restrict image,
+  const PixelChanel channel)
+{
+  return(image->channel_map[channel].offset);
+}
+
 static inline PixelTrait GetPixelChannelMapTraits(const Image *restrict image,
   const int offset)
 {

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 35d6d066814eca4cfca57a4c10a90110524246e9..9b9376c819130478793f386577c0a6ae133af874 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -2838,7 +2838,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
     scanline=(MagickRealType *) AcquireQuantumMemory((size_t) image->columns,
       GetPixelChannels(image)*sizeof(*scanline));
   scale_scanline=(MagickRealType *) AcquireQuantumMemory((size_t)
-    scale_image->columns,GetPixelChannels(image)*sizeof(*scale_scanline));
+    scale_image->columns,MaxPixelChannels*sizeof(*scale_scanline));
   y_vector=(MagickRealType *) AcquireQuantumMemory((size_t) image->columns,
     GetPixelChannels(image)*sizeof(*y_vector));
   if ((scanline == (MagickRealType *) NULL) ||