GraphicsMagick: QuantumDepthCB(): Fix compilation failure in Q32...

changeset ed951032a601 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=ed951032a601
summary: QuantumDepthCB(): Fix compilation failure in Q32 build

diffstat:

 ChangeLog                              |  5 +++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 magick/operator.c                      |  9 +++++----
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  7 +++++++
 5 files changed, 21 insertions(+), 8 deletions(-)

diffs (87 lines):

diff -r b74667257bad -r ed951032a601 ChangeLog
--- a/ChangeLog	Wed Jun 07 12:03:43 2023 -0500
+++ b/ChangeLog	Fri Jun 09 08:10:12 2023 -0500
@@ -1,3 +1,8 @@
+2023-06-09  Bob Friesenhahn  <[email protected]>
+
+	* magick/operator.c (QuantumDepthCB): Fix compilation failure in
+	Q32 build.
+
 2023-06-07  Bob Friesenhahn  <[email protected]>
 
 	* coders/tiff.c (TIFFReadErrors): Mask "Internal error, unknown
diff -r b74667257bad -r ed951032a601 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Wed Jun 07 12:03:43 2023 -0500
+++ b/VisualMagick/installer/inc/version.isx	Fri Jun 09 08:10:12 2023 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230607"
-#define public MagickPackageReleaseDate "snapshot-20230607"
+#define public MagickPackageVersionAddendum ".020230609"
+#define public MagickPackageReleaseDate "snapshot-20230609"
diff -r b74667257bad -r ed951032a601 magick/operator.c
--- a/magick/operator.c	Wed Jun 07 12:03:43 2023 -0500
+++ b/magick/operator.c	Fri Jun 09 08:10:12 2023 -0500
@@ -550,6 +550,9 @@
   unsigned int
     depth;
 
+  unsigned int
+    scale;
+
   register long
     i;
 
@@ -567,6 +570,8 @@
 
   if (depth < QuantumDepth)
     {
+      scale=MaxRGB / (MaxRGB >> (QuantumDepth-depth));
+
       /*
         Build LUT for Q8 and Q16 builds
       */
@@ -576,10 +581,6 @@
 #  endif
       if (mutable_context->channel_lut == (Quantum *) NULL)
         {
-          unsigned int
-            scale;
-
-          scale=MaxRGB / (MaxRGB >> (QuantumDepth-depth));
           mutable_context->channel_lut=MagickAllocateArray(Quantum *, MaxMap+1,sizeof(Quantum));
           if (mutable_context->channel_lut == (Quantum *) NULL)
             status=MagickFail;
diff -r b74667257bad -r ed951032a601 magick/version.h
--- a/magick/version.h	Wed Jun 07 12:03:43 2023 -0500
+++ b/magick/version.h	Fri Jun 09 08:10:12 2023 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230607"
-#define MagickReleaseDate  "snapshot-20230607"
+#define MagickChangeDate   "20230609"
+#define MagickReleaseDate  "snapshot-20230609"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r b74667257bad -r ed951032a601 www/Changelog.html
--- a/www/Changelog.html	Wed Jun 07 12:03:43 2023 -0500
+++ b/www/Changelog.html	Fri Jun 09 08:10:12 2023 -0500
@@ -37,6 +37,13 @@
 </div>
 
 <div class="document">
+<p>2023-06-09  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>magick/operator.c (QuantumDepthCB): Fix compilation failure in
+Q32 build.</p></li>
+</ul>
+</blockquote>
 <p>2023-06-07  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">