[prev in list] [next in list] [prev in thread] [next in thread]
List: graphicsmagick-commit
Subject: [GM-commit] GraphicsMagick: Compilation warnings improvements.
From: GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date: 2020-12-30 1:49:30
Message-ID: mailman.251676.1609292989.1535.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]
changeset e89a40760b17 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=e89a40760b17
summary: Compilation warnings improvements.
diffstat:
ChangeLog | 5 +++++
coders/meta.c | 10 ++++++++++
coders/mpc.c | 16 ++++++++--------
magick/random.c | 9 ++++++---
magick/utility-private.h | 2 +-
www/Changelog.html | 3 +++
6 files changed, 33 insertions(+), 12 deletions(-)
diffs (166 lines):
diff -r 0a252b21e156 -r e89a40760b17 ChangeLog
--- a/ChangeLog Tue Dec 29 17:32:31 2020 -0600
+++ b/ChangeLog Tue Dec 29 19:49:27 2020 -0600
@@ -1,5 +1,10 @@
2020-12-29 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+ * coders/mpc.c (ReadMPCImage): 'i' should be unsigned.
+
+ * magick/random.c (InitializeMagickRandomKernel): 'done' is not
+ used in all compilation implementations.
+
* magick/nt_feature.c (CropImageToHBITMAP): Dependent on HasWINGDI32.
(ImageToHBITMAP): Dependent on HasWINGDI32.
diff -r 0a252b21e156 -r e89a40760b17 coders/meta.c
--- a/coders/meta.c Tue Dec 29 17:32:31 2020 -0600
+++ b/coders/meta.c Tue Dec 29 19:49:27 2020 -0600
@@ -575,6 +575,16 @@
tlen=q-p;
len<<=1;
+ /*
+ FIXME: Something wrong here!
+In function ‘parse8BIMW',
+ inlined from ‘ReadMETAImage' at .../GM/coders/meta.c:1193:18:
+.../GM/coders/meta.c:663:12: warning: ‘%s' directive argument is null \
[-Wformat-overflow=] + 663 | (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 664 | "META CODER Parse8BIM: %s (%lu)",line, (unsigned \
long) inputlen); + | \
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + */
new_p=MagickReallocateResourceLimitedMemory(unsigned char *,p,(len+2));
*b=(char *) new_p;
if (new_p == (unsigned char *) NULL)
diff -r 0a252b21e156 -r e89a40760b17 coders/mpc.c
--- a/coders/mpc.c Tue Dec 29 17:32:31 2020 -0600
+++ b/coders/mpc.c Tue Dec 29 19:49:27 2020 -0600
@@ -162,7 +162,7 @@
int
c;
- register long
+ register unsigned long
i;
register unsigned char
@@ -860,7 +860,7 @@
*/
if (number_of_profiles > 0)
{
- for (i=0; i < (long) number_of_profiles; i++)
+ for (i=0; i < number_of_profiles; i++)
{
if (profiles[i].length > 0)
{
@@ -906,7 +906,7 @@
ThrowMPCReaderException(ResourceLimitError,MemoryAllocationFailed,
image);
if (image->colors == 0)
- for (i=0; i < 256; i++)
+ for (i=0; i < 256U; i++)
{
image->colormap[i].red=ScaleCharToQuantum(i);
image->colormap[i].green=ScaleCharToQuantum(i);
@@ -932,14 +932,14 @@
(void) ReadBlob(image, (size_t) packet_size*image->colors,colormap);
p=colormap;
if (image->depth <= 8)
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < image->colors; i++)
{
image->colormap[i].red=ScaleCharToQuantum(*p++);
image->colormap[i].green=ScaleCharToQuantum(*p++);
image->colormap[i].blue=ScaleCharToQuantum(*p++);
}
else
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < image->colors; i++)
{
image->colormap[i].red=(*p++ << 8);
image->colormap[i].red|=(*p++);
@@ -1114,7 +1114,7 @@
ExtendedSignedIntegralType
offset;
- register long
+ register unsigned long
i;
unsigned int
@@ -1438,7 +1438,7 @@
*/
q=colormap;
if (image->depth <= 8)
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < image->colors; i++)
{
*q++=image->colormap[i].red;
*q++=image->colormap[i].green;
@@ -1446,7 +1446,7 @@
}
#if QuantumDepth > 8
else
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < image->colors; i++)
{
*q++=image->colormap[i].red >> 8;
*q++=image->colormap[i].red & 0xff;
diff -r 0a252b21e156 -r e89a40760b17 magick/random.c
--- a/magick/random.c Tue Dec 29 17:32:31 2020 -0600
+++ b/magick/random.c Tue Dec 29 19:49:27 2020 -0600
@@ -109,9 +109,6 @@
MagickExport void
InitializeMagickRandomKernel(MagickRandomKernel *kernel)
{
- MagickBool
- done = MagickFalse;
-
kernel->z = 0U;
kernel->w = 0U;
#if defined(POSIX) && HAVE_DEV_URANDOM
@@ -122,6 +119,9 @@
test for it produces an invalid result.
*/
{
+ MagickBool
+ done = MagickFalse;
+
int
file;
@@ -142,6 +142,9 @@
Is claimed to be supported under Windows XP
*/
{
+ MagickBool
+ done = MagickFalse;
+
HCRYPTPROV
hProvider = 0;
diff -r 0a252b21e156 -r e89a40760b17 magick/utility-private.h
--- a/magick/utility-private.h Tue Dec 29 17:32:31 2020 -0600
+++ b/magick/utility-private.h Tue Dec 29 19:49:27 2020 -0600
@@ -31,7 +31,7 @@
extern MagickExport MagickPassFail MagickAtoUIChk(const char *str, unsigned int \
*value); extern MagickExport MagickPassFail MagickAtoLChk(const char *str, long \
*value); extern MagickExport MagickPassFail MagickAtoULChk(const char *str, unsigned \
long *value);
-extern MagickExport long MagickDoubleToLong(const double dval/*, ExceptionInfo \
*exception*/); +extern MagickExport long MagickDoubleToLong(const double dval/*, \
ExceptionInfo *exception*/) MAGICK_FUNC_CONST;
/*
Compute a value which is the next kilobyte power of 2 larger than
diff -r 0a252b21e156 -r e89a40760b17 www/Changelog.html
--- a/www/Changelog.html Tue Dec 29 17:32:31 2020 -0600
+++ b/www/Changelog.html Tue Dec 29 19:49:27 2020 -0600
@@ -38,6 +38,9 @@
<p>2020-12-29 Bob Friesenhahn <<a class="reference external" \
href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span> \
4;</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>
<blockquote>
<ul class="simple">
+<li>coders/mpc.c (ReadMPCImage): 'i' should be unsigned.</li>
+<li>magick/random.c (InitializeMagickRandomKernel): 'done' is not
+used in all compilation implementations.</li>
<li>magick/nt_feature.c (CropImageToHBITMAP): Dependent on HasWINGDI32.
(ImageToHBITMAP): Dependent on HasWINGDI32.</li>
<li>coders/jp2.c: JasPer changed its jas_stream_ops_t callback
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic