GraphicsMagick: Update Gm-prefixed symbols. Fix unexpected exte...
GraphicsMagick Commits <[email protected]> Wed, 17 Jan 2024 15:22:46 -0600
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.3858.1705526574.25875.graphicsmagick-commit@lists.sourceforge.net> |
changeset 1b27e1178a08 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=1b27e1178a08 summary: Update Gm-prefixed symbols. Fix unexpected externs in coders/bmp.c diffstat: ChangeLog | 6 ++++++ coders/bmp.c | 10 +++++----- magick/symbols.h | 8 +++++++- scripts/gmsymbols.sh | 2 +- wand/wand_symbols.h | 2 +- www/Changelog.html | 4 ++++ 6 files changed, 24 insertions(+), 8 deletions(-) diffs (104 lines): diff -r d83de1dc3756 -r 1b27e1178a08 ChangeLog --- a/ChangeLog Wed Jan 17 15:02:25 2024 -0600 +++ b/ChangeLog Wed Jan 17 15:22:43 2024 -0600 @@ -1,5 +1,11 @@ 2024-01-17 Bob Friesenhahn <[email protected]> + * magick/symbols.h, wand/wand_symbols.h: Update Gm-prefixed + symbols. + + * coders/bmp.c: Eliminate 'TForeignFormatDesc' and 'StoreDescPNG' + which were accidentally writeable globals. + * Fix spelling errors in code and documentation. 2024-01-13 Fojtik Jaroslav <[email protected]> diff -r d83de1dc3756 -r 1b27e1178a08 coders/bmp.c --- a/coders/bmp.c Wed Jan 17 15:02:25 2024 -0600 +++ b/coders/bmp.c Wed Jan 17 15:22:43 2024 -0600 @@ -2059,13 +2059,13 @@ typedef struct { - const char *FormatName; - const char *FormatNameDDot; - const char *Desc; + const char FormatName[5]; + const char FormatNameDDot[6]; + const char Desc[24]; } TForeignFormatDesc; -const TForeignFormatDesc StoreDescJPG = {"JPEG", "JPEG:", " Creating jpeg_image."}; -const TForeignFormatDesc StoreDescPNG = {"PNG", "PNG:", " Creating png_image."}; +static const TForeignFormatDesc StoreDescJPG = {"JPEG", "JPEG:", " Creating jpeg_image."}; +static const TForeignFormatDesc StoreDescPNG = {"PNG", "PNG:", " Creating png_image."}; static int StoreAlienBlob(Image * image, const ImageInfo * image_info, const TForeignFormatDesc *pFormatDesc) diff -r d83de1dc3756 -r 1b27e1178a08 magick/symbols.h --- a/magick/symbols.h Wed Jan 17 15:02:25 2024 -0600 +++ b/magick/symbols.h Wed Jan 17 15:22:43 2024 -0600 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2023 GraphicsMagick Group + Copyright (C) 2012-2024 GraphicsMagick Group This program is covered by multiple licenses, which are described in Copyright.txt. You should have received a copy of Copyright.txt with this @@ -541,7 +541,12 @@ #define MagickConstrainColormapIndex GmMagickConstrainColormapIndex #define MagickCreateDirectoryPath GmMagickCreateDirectoryPath #define MagickDestroyCommandInfo GmMagickDestroyCommandInfo +#define MagickDoubleToInt GmMagickDoubleToInt #define MagickDoubleToLong GmMagickDoubleToLong +#define MagickDoubleToShort GmMagickDoubleToShort +#define MagickDoubleToUInt GmMagickDoubleToUInt +#define MagickDoubleToULong GmMagickDoubleToULong +#define MagickDoubleToUShort GmMagickDoubleToUShort #define MagickFindRawImageMinMax GmMagickFindRawImageMinMax #define MagickFmax GmMagickFmax #define MagickFmin GmMagickFmin @@ -1134,6 +1139,7 @@ #define WriteBlobByte GmWriteBlobByte #define WriteBlobFile GmWriteBlobFile #define WriteBlob GmWriteBlob +#define WriteBlobLSBDouble GmWriteBlobLSBDouble #define WriteBlobLSBLong GmWriteBlobLSBLong #define WriteBlobLSBShort GmWriteBlobLSBShort #define WriteBlobLSBSignedLong GmWriteBlobLSBSignedLong diff -r d83de1dc3756 -r 1b27e1178a08 scripts/gmsymbols.sh --- a/scripts/gmsymbols.sh Wed Jan 17 15:02:25 2024 -0600 +++ b/scripts/gmsymbols.sh Wed Jan 17 15:22:43 2024 -0600 @@ -8,7 +8,7 @@ cat <<EOF /* - Copyright (C) 2012-2022 GraphicsMagick Group + Copyright (C) 2012-2024 GraphicsMagick Group This program is covered by multiple licenses, which are described in Copyright.txt. You should have received a copy of Copyright.txt with this diff -r d83de1dc3756 -r 1b27e1178a08 wand/wand_symbols.h --- a/wand/wand_symbols.h Wed Jan 17 15:02:25 2024 -0600 +++ b/wand/wand_symbols.h Wed Jan 17 15:22:43 2024 -0600 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2022 GraphicsMagick Group + Copyright (C) 2012-2024 GraphicsMagick Group This program is covered by multiple licenses, which are described in Copyright.txt. You should have received a copy of Copyright.txt with this diff -r d83de1dc3756 -r 1b27e1178a08 www/Changelog.html --- a/www/Changelog.html Wed Jan 17 15:02:25 2024 -0600 +++ b/www/Changelog.html Wed Jan 17 15:22:43 2024 -0600 @@ -40,6 +40,10 @@ <p>2024-01-17 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> <ul class="simple"> +<li><p>magick/symbols.h, wand/wand_symbols.h: Update Gm-prefixed +symbols.</p></li> +<li><p>coders/bmp.c: Eliminate 'TForeignFormatDesc' and 'StoreDescPNG' +which were accidentally writeable globals.</p></li> <li><p>Fix spelling errors in code and documentation.</p></li> </ul> </blockquote>