GraphicsMagick: ExportViewPixelArea() : Fix Control flow issues ...

changeset 341387970c85 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=341387970c85
summary: ExportViewPixelArea() : Fix Control flow issues (DEADCODE)

diffstat:

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

diffs (101 lines):

diff -r 47dbc2c25234 -r 341387970c85 ChangeLog
--- a/ChangeLog	Sat Nov 05 00:34:57 2022 +0100
+++ b/ChangeLog	Tue Nov 08 14:23:37 2022 -0600
@@ -1,3 +1,9 @@
+2022-11-08  Bob Friesenhahn  <[email protected]>
+
+	* magick/export.c (ExportViewPixelArea): Fix Coverity issue
+	"Control flow issues (DEADCODE)" for the case where QuantumDepth =
+	32.
+
 2022-11-05 Fojtik Jaroslav  <[email protected]>
 
         * coders/wpg.c Shrink amount of colors when palette is bigger than
diff -r 47dbc2c25234 -r 341387970c85 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sat Nov 05 00:34:57 2022 +0100
+++ b/VisualMagick/installer/inc/version.isx	Tue Nov 08 14:23:37 2022 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020221103"
-#define public MagickPackageReleaseDate "snapshot-20221103"
+#define public MagickPackageVersionAddendum ".020221108"
+#define public MagickPackageReleaseDate "snapshot-20221108"
diff -r 47dbc2c25234 -r 341387970c85 magick/export.c
--- a/magick/export.c	Sat Nov 05 00:34:57 2022 +0100
+++ b/magick/export.c	Tue Nov 08 14:23:37 2022 -0600
@@ -3085,7 +3085,6 @@
     sample_type = UnsignedQuantumSampleType;
 
   unsigned int
-    unsigned_maxvalue=MaxRGB,
     sample_bits;
 
   unsigned long
@@ -3156,9 +3155,6 @@
   double_scale=(double) (double_maxvalue-double_minvalue)/MaxRGB;
   if ((sample_type != FloatQuantumSampleType) && (sample_bits <= 32U))
     {
-      /* Maximum value which may be represented by a sample */
-      unsigned_maxvalue=MaxValueGivenBits(sample_bits);
-
       if (QuantumDepth == sample_bits)
         {
         }
@@ -3167,11 +3163,16 @@
           /* Divide to scale down */
           unsigned_scale=(MaxRGB / (MaxRGB >> (QuantumDepth-sample_bits)));
         }
+#if QuantumDepth < 32
       else if (QuantumDepth < sample_bits)
         {
+          /* Maximum value which may be represented by a sample */
+          const unsigned int unsigned_maxvalue=MaxValueGivenBits(sample_bits);
+
           /* Multiply to scale up */
           unsigned_scale=(unsigned_maxvalue/MaxRGB);
         }
+#endif /* #if QuantumDepth < 32 */
     }
 
   image=GetCacheViewImage(view);
diff -r 47dbc2c25234 -r 341387970c85 magick/version.h
--- a/magick/version.h	Sat Nov 05 00:34:57 2022 +0100
+++ b/magick/version.h	Tue Nov 08 14:23:37 2022 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272400
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,0
-#define MagickChangeDate   "20221103"
-#define MagickReleaseDate  "snapshot-20221103"
+#define MagickChangeDate   "20221108"
+#define MagickReleaseDate  "snapshot-20221108"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 47dbc2c25234 -r 341387970c85 www/Changelog.html
--- a/www/Changelog.html	Sat Nov 05 00:34:57 2022 +0100
+++ b/www/Changelog.html	Tue Nov 08 14:23:37 2022 -0600
@@ -37,6 +37,21 @@
 </div>
 
 <div class="document">
+<p>2022-11-08  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/export.c (ExportViewPixelArea): Fix Coverity issue
+&quot;Control flow issues (DEADCODE)&quot; for the case where QuantumDepth =
+32.</p></li>
+</ul>
+</blockquote>
+<p>2022-11-05 Fojtik Jaroslav  &lt;<a class="reference external" href="mailto:JaFojtik&#37;&#52;&#48;yandex&#46;com">JaFojtik<span>&#64;</span>yandex<span>&#46;</span>com</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/wpg.c Shrink amount of colors when palette is bigger than
+raster could store.</p></li>
+</ul>
+</blockquote>
 <p>2022-11-03  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">