Commit 72cac5456 for imagemagick.org
commit 72cac54567dbb75ee665d1fcd1a85a26e0acd63c
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Sun Nov 15 21:54:32 2026 +0100
Fix 64-bit integer quantum channel import and export.
diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index 5f0d042e6..2e7dc1240 100644
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -417,7 +417,13 @@ static void ExportPixelChannel(const Image *image,QuantumInfo *quantum_info,
}
break;
}
- magick_fallthrough;
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ q=PopLongLongPixel(quantum_info->endian,ScaleQuantumToLongLong(*p),q);
+ p+=(ptrdiff_t) GetPixelChannels(image);
+ q+=(ptrdiff_t) quantum_info->pad;
+ }
+ break;
}
default:
{
diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index 818262e3a..92192089e 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -432,7 +432,20 @@ static void ImportPixelChannel(const Image *image,QuantumInfo *quantum_info,
}
break;
}
- magick_fallthrough;
+ else
+ {
+ MagickSizeType
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongLongPixel(quantum_info->endian,p,&pixel);
+ *q=ScaleLongLongToQuantum(pixel);
+ p+=(ptrdiff_t) quantum_info->pad;
+ q+=(ptrdiff_t) GetPixelChannels(image);
+ }
+ break;
+ }
}
default:
{
diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h
index e8c8661b0..20154d19b 100644
--- a/MagickCore/quantum-private.h
+++ b/MagickCore/quantum-private.h
@@ -229,6 +229,18 @@ static inline unsigned char *PopLongPixel(const EndianType endian,
return(pixels);
}
+static inline unsigned char *PopLongLongPixel(const EndianType endian,
+ const MagickSizeType pixel,unsigned char *magick_restrict pixels)
+{
+ if (endian == LSBEndian)
+ {
+ pixels=PopLongPixel(endian,(unsigned int) pixel,pixels);
+ return(PopLongPixel(endian,(unsigned int) (pixel >> 32),pixels));
+ }
+ pixels=PopLongPixel(endian,(unsigned int) (pixel >> 32),pixels);
+ return(PopLongPixel(endian,(unsigned int) pixel,pixels));
+}
+
static inline unsigned char *PopShortPixel(const EndianType endian,
const unsigned short pixel,unsigned char *magick_restrict pixels)
{
@@ -279,6 +291,28 @@ static inline const unsigned char *PushLongPixel(const EndianType endian,
return(pixels);
}
+static inline const unsigned char *PushLongLongPixel(const EndianType endian,
+ const unsigned char *magick_restrict pixels,
+ MagickSizeType *magick_restrict pixel)
+{
+ unsigned int
+ high,
+ low;
+
+ if (endian == LSBEndian)
+ {
+ pixels=PushLongPixel(endian,pixels,&low);
+ pixels=PushLongPixel(endian,pixels,&high);
+ }
+ else
+ {
+ pixels=PushLongPixel(endian,pixels,&high);
+ pixels=PushLongPixel(endian,pixels,&low);
+ }
+ *pixel=((MagickSizeType) high << 32) | (MagickSizeType) low;
+ return(pixels);
+}
+
static inline const unsigned char *PushShortPixel(const EndianType endian,
const unsigned char *magick_restrict pixels,
unsigned short *magick_restrict pixel)