(no commit message)

diff --git a/magick/color.c b/magick/color.c
index 56653d8196b5b632d164790dba3f914c79cfb41c..e5c24d726893487da908e52c5792a577b84e0e83 100644 (file)
--- 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 f5a646432aa827b8d4758e1560abfcec9234aad4..61f900e817c6c6b0dc14e9096aeeeceac01de1e1 100644 (file)
--- 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 aa0222be00b18722bc4a9341f6f925e8b065136b..a72ac0ac6b2ac54618c26f7675bd1a29bc27a6d0 100644 (file)
--- 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.