From 2a79056aaa95f5eaef0284ae5bec1e86cb7ab0e1 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 20 Sep 2010 00:11:18 +0000 Subject: [PATCH] --- magick/color.c | 3 ++- magick/deprecate.h | 1 + magick/magick-type.h | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/magick/color.c b/magick/color.c index 56653d819..e5c24d726 100644 --- a/magick/color.c +++ b/magick/color.c @@ -1365,7 +1365,8 @@ static void ConcatentateHexColorComponent(const MagickPixelPacket *pixel, } if (pixel->depth > 32) { - (void) FormatMagickString(component,MaxTextExtent,"%08lX", + (void) FormatMagickString(component,MaxTextExtent,"%08lX%08X", + (unsigned long) ScaleQuantumToLong(ClampToQuantum(color)), (unsigned long) ScaleQuantumToLong(ClampToQuantum(color))); (void) ConcatenateMagickString(tuple,component,MaxTextExtent); return; diff --git a/magick/deprecate.h b/magick/deprecate.h index f5a646432..61f900e81 100644 --- a/magick/deprecate.h +++ b/magick/deprecate.h @@ -52,6 +52,7 @@ extern "C" { #define LiberateMagickResource(resource) RelinquishMagickResource(resource) #define LiberateSemaphore(semaphore) RelinquishSemaphore(semaphore) #define QuantumDepth MAGICKCORE_QUANTUM_DEPTH +#define MaxRGB QuantumRange /* deprecated */ #define RunlengthEncodedCompression RLECompression #define Upscale(value) ScaleCharToQuantum(value) #define XDownscale(value) ScaleShortToQuantum(value) diff --git a/magick/magick-type.h b/magick/magick-type.h index aa0222be0..a72ac0ac6 100644 --- a/magick/magick-type.h +++ b/magick/magick-type.h @@ -90,7 +90,6 @@ typedef unsigned int Quantum; #define MaxColormapSize 65536UL #define MaxMap 65535UL -#define MAGICKCORE_HDRI_SUPPORT 1 typedef long double MagickRealType; typedef double Quantum; #define QuantumRange 18446744073709551615.0 @@ -100,7 +99,6 @@ typedef double Quantum; # error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64" #endif #endif -#define MaxRGB QuantumRange /* deprecated */ /* Typedef declarations. -- 2.50.1