GraphicsMagick: MIFF/MPC: Fix warnings from GCC 11.

changeset 4fdd57cdd171 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=4fdd57cdd171
summary: MIFF/MPC: Fix warnings from GCC 11.

diffstat:

 ChangeLog                              |   6 +++++
 VisualMagick/installer/inc/version.isx |   4 +-
 coders/miff.c                          |  38 ++++++++-------------------------
 coders/mpc.c                           |  21 +++++-------------
 magick/version.h                       |   4 +-
 www/Changelog.html                     |   9 ++++++-
 6 files changed, 33 insertions(+), 49 deletions(-)

diffs (198 lines):

diff -r 0618a7e599f5 -r 4fdd57cdd171 ChangeLog
--- a/ChangeLog	Fri Jan 21 18:21:25 2022 -0600
+++ b/ChangeLog	Sat Jan 22 10:46:18 2022 -0600
@@ -1,3 +1,9 @@
+2022-01-22  Bob Friesenhahn  <[email protected]>
+
+        * coders/mpc.c: Fix warnings from GCC 11.
+
+        * coders/miff.c: Fix warnings from GCC 11.
+
 2022-01-21  Bob Friesenhahn  <[email protected]>
 
         * coders/jp2.c: Adaptations to work with Jasper 3.0.0's
diff -r 0618a7e599f5 -r 4fdd57cdd171 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Fri Jan 21 18:21:25 2022 -0600
+++ b/VisualMagick/installer/inc/version.isx	Sat Jan 22 10:46:18 2022 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020220121"
-#define public MagickPackageReleaseDate "snapshot-20220121"
+#define public MagickPackageVersionAddendum ".020220122"
+#define public MagickPackageReleaseDate "snapshot-20220122"
diff -r 0618a7e599f5 -r 4fdd57cdd171 coders/miff.c
--- a/coders/miff.c	Fri Jan 21 18:21:25 2022 -0600
+++ b/coders/miff.c	Sat Jan 22 10:46:18 2022 -0600
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003-2021 GraphicsMagick Group
+% Copyright (C) 2003-2022 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 % Copyright 1991-1999 E. I. du Pont de Nemours and Company
 %
@@ -736,7 +736,7 @@
   MagickFreeResourceLimitedMemory(values); \
   if (number_of_profiles > 0) \
     { \
-      unsigned int _index; \
+      unsigned long _index; \
       for (_index=0; _index < number_of_profiles; _index++) \
         { \
           MagickFreeMemory(profiles[_index].name); \
@@ -814,7 +814,7 @@
   ProfileInfo
     *profiles=0;
 
-  unsigned int
+  unsigned long
     number_of_profiles=0;
 
   char
@@ -1081,24 +1081,15 @@
                 if (LocaleCompare(keyword,"color-profile") == 0)
                   {
                     ProfileInfo
-                      *new_profiles;
+                      *new_profiles = (ProfileInfo *) NULL;
 
                     if (MagickAtoL(values) <= 0)
                       ThrowMIFFReaderException(CorruptImageError,ImproperImageHeader,image);
-                    i=(long) number_of_profiles;
+                    i=number_of_profiles;
                     new_profiles=MagickReallocateResourceLimitedArray(ProfileInfo *,profiles,
-                                                                      (size_t) i+1,sizeof(ProfileInfo));
+                                                                      number_of_profiles+1,sizeof(ProfileInfo));
                     if (new_profiles == (ProfileInfo *) NULL)
-                      {
-                        for (i=0; i < number_of_profiles; i++)
-                          {
-                            MagickFreeMemory(profiles[i].name);
-                            MagickFreeResourceLimitedMemory(profiles[i].info);
-                          }
-                        MagickFreeResourceLimitedMemory(profiles);
-                        MagickFreeResourceLimitedMemory(values);
-                        ThrowMIFFReaderException(ResourceLimitError,MemoryAllocationFailed,image);
-                      }
+                      ThrowMIFFReaderException(ResourceLimitError,MemoryAllocationFailed,image);
                     profiles=new_profiles;
                     profiles[i].name=AllocateString("icc");
                     profiles[i].length=MagickAtoL(values);
@@ -1278,20 +1269,11 @@
 
                     if (MagickAtoL(values) <= 0)
                       ThrowMIFFReaderException(CorruptImageError,ImproperImageHeader,image);
-                    i=(long) number_of_profiles;
+                    i=number_of_profiles;
                     new_profiles=MagickReallocateResourceLimitedArray(ProfileInfo *,profiles,
-                                                                      (size_t) i+1,sizeof(ProfileInfo));
+                                                                      number_of_profiles+1,sizeof(ProfileInfo));
                     if (new_profiles == (ProfileInfo *) NULL)
-                      {
-                        for (i=0; i < number_of_profiles; i++)
-                          {
-                            MagickFreeMemory(profiles[i].name);
-                            MagickFreeResourceLimitedMemory(profiles[i].info);
-                          }
-                        MagickFreeResourceLimitedMemory(profiles);
-                        MagickFreeResourceLimitedMemory(values);
-                        ThrowMIFFReaderException(ResourceLimitError,MemoryAllocationFailed,image);
-                      }
+                      ThrowMIFFReaderException(ResourceLimitError,MemoryAllocationFailed,image);
                     profiles=new_profiles;
                     profiles[i].name=AllocateString(keyword+8);
                     profiles[i].length=MagickAtoL(values);
diff -r 0618a7e599f5 -r 4fdd57cdd171 coders/mpc.c
--- a/coders/mpc.c	Fri Jan 21 18:21:25 2022 -0600
+++ b/coders/mpc.c	Sat Jan 22 10:46:18 2022 -0600
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003-2021 GraphicsMagick Group
+% Copyright (C) 2003-2022 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 %
 % This program is covered by multiple licenses, which are described in
@@ -132,7 +132,7 @@
   MagickFreeResourceLimitedMemory(values); \
   if (number_of_profiles > 0) \
     { \
-      unsigned int _index; \
+      unsigned long _index; \
       for (_index=0; _index < number_of_profiles; _index++) \
         { \
           MagickFreeMemory(profiles[_index].name); \
@@ -179,7 +179,7 @@
   ProfileInfo
     *profiles=0;
 
-  unsigned int
+  unsigned long
     number_of_profiles=0;
 
   char
@@ -658,21 +658,12 @@
                     ProfileInfo
                       *new_profiles;
 
-                    i=(long) number_of_profiles;
+                    i=number_of_profiles;
 
                     new_profiles=MagickReallocateResourceLimitedArray(ProfileInfo *,profiles,
-                                                                      (size_t) i+1,sizeof(ProfileInfo));
+                                                                      number_of_profiles+1,sizeof(ProfileInfo));
                     if (new_profiles == (ProfileInfo *) NULL)
-                      {
-                        for (i=0; i < number_of_profiles; i++)
-                          {
-                            MagickFreeMemory(profiles[i].name);
-                            MagickFreeResourceLimitedMemory(profiles[i].info);
-                          }
-                        MagickFreeResourceLimitedMemory(profiles);
-                        MagickFreeResourceLimitedMemory(values);
-                        ThrowMPCReaderException(ResourceLimitError,MemoryAllocationFailed,image);
-                      }
+                      ThrowMPCReaderException(ResourceLimitError,MemoryAllocationFailed,image);
                     profiles=new_profiles;
                     profiles[i].name=AllocateString(keyword+8);
                     profiles[i].length=MagickAtoL(values);
diff -r 0618a7e599f5 -r 4fdd57cdd171 magick/version.h
--- a/magick/version.h	Fri Jan 21 18:21:25 2022 -0600
+++ b/magick/version.h	Sat Jan 22 10:46:18 2022 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x262300
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 26,23,0
-#define MagickChangeDate   "20220121"
-#define MagickReleaseDate  "snapshot-20220121"
+#define MagickChangeDate   "20220122"
+#define MagickReleaseDate  "snapshot-20220122"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 0618a7e599f5 -r 4fdd57cdd171 www/Changelog.html
--- a/www/Changelog.html	Fri Jan 21 18:21:25 2022 -0600
+++ b/www/Changelog.html	Sat Jan 22 10:46:18 2022 -0600
@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.16: http://docutils.sourceforge.net/" />
-<title>Changelog.rst</title>
+<meta name="generator" content="Docutils 0.13.1: http://docutils.sourceforge.net/" />
+<title></title>
 <link rel="stylesheet" href="docutils-articles.css" type="text/css" />
 </head>
 <body>
@@ -35,6 +35,11 @@
 <div class="document">
 
 
+<p>2022-01-22  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>
+<p>* coders/mpc.c: Fix warnings from GCC 11.</p>
+<p>* coders/miff.c: Fix warnings from GCC 11.</p>
+</blockquote>
 <p>2022-01-21  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>
 * coders/jp2.c: Adaptations to work with Jasper 3.0.0's