GraphicsMagick: 3 new changesets
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.23197.1669502302.1567.graphicsmagick-commit@lists.sourceforge.net> |
changeset 120ad2e8b776 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=120ad2e8b776 summary: Fix for "image Over 120,150 0,0 foo" reporting an error rather than using foo's dimensions changeset bab83cd02554 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=bab83cd02554 summary: RegisterLOGOImage(): Logo image subformats do not have an image extension. changeset 84185c5ed68b in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=84185c5ed68b summary: Added more convert tests. diffstat: ChangeLog | 11 +++++++++++ Makefile.am | 2 +- Makefile.in | 2 +- VisualMagick/installer/inc/version.isx | 4 ++-- coders/logo.c | 7 +++++++ magick/render.c | 10 +++++++++- magick/version.h | 4 ++-- magick/xwindow.c | 2 +- utilities/tests/convert-cmds.txt | 21 +++++++++++++++++++++ utilities/tests/convert.tap | 2 +- www/Changelog.html | 11 +++++++++++ 11 files changed, 67 insertions(+), 9 deletions(-) diffs (229 lines): diff -r 3136789dc62e -r 84185c5ed68b ChangeLog --- a/ChangeLog Fri Nov 25 13:50:32 2022 -0600 +++ b/ChangeLog Sat Nov 26 16:38:03 2022 -0600 @@ -1,3 +1,14 @@ +2022-11-26 Bob Friesenhahn <[email protected]> + + * coders/logo.c (RegisterLOGOImage): Logo image subformats do not + have an image extension. + + * utilities/tests/convert-cmds.txt: Add more convert tests. + + * magick/render.c (DrawPrimitive): Fix for SourceForge issue #679 + "Using "0,0" for image size throws an error in v1.3.38, worked + previously". This bug was added in GraphicsMagick 1.3.36. + 2022-11-25 Bob Friesenhahn <[email protected]> * coders/jpeg.c (ReadJPEGImage): Eliminate Clang Analyzer diff -r 3136789dc62e -r 84185c5ed68b Makefile.am --- a/Makefile.am Fri Nov 25 13:50:32 2022 -0600 +++ b/Makefile.am Sat Nov 26 16:38:03 2022 -0600 @@ -483,7 +483,7 @@ # -enable-checker security.insecureAPI.DeprecatedOrUnsafeBufferHandling scan-build: scan-build-12 -k --html-title='GraphicsMagick' \ - -maxloop 100 \ + -maxloop 1000 \ -disable-checker deadcode.DeadStores \ -enable-checker security.insecureAPI.bcmp \ -enable-checker security.insecureAPI.bcopy \ diff -r 3136789dc62e -r 84185c5ed68b Makefile.in --- a/Makefile.in Fri Nov 25 13:50:32 2022 -0600 +++ b/Makefile.in Sat Nov 26 16:38:03 2022 -0600 @@ -11513,7 +11513,7 @@ # -enable-checker security.insecureAPI.DeprecatedOrUnsafeBufferHandling scan-build: scan-build-12 -k --html-title='GraphicsMagick' \ - -maxloop 100 \ + -maxloop 1000 \ -disable-checker deadcode.DeadStores \ -enable-checker security.insecureAPI.bcmp \ -enable-checker security.insecureAPI.bcopy \ diff -r 3136789dc62e -r 84185c5ed68b VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Fri Nov 25 13:50:32 2022 -0600 +++ b/VisualMagick/installer/inc/version.isx Sat Nov 26 16:38:03 2022 -0600 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020221125" -#define public MagickPackageReleaseDate "snapshot-20221125" +#define public MagickPackageVersionAddendum ".020221126" +#define public MagickPackageReleaseDate "snapshot-20221126" diff -r 3136789dc62e -r 84185c5ed68b coders/logo.c --- a/coders/logo.c Fri Nov 25 13:50:32 2022 -0600 +++ b/coders/logo.c Sat Nov 26 16:38:03 2022 -0600 @@ -5105,6 +5105,7 @@ entry->stealth=True; entry->description="Granite texture"; entry->module="LOGO"; + entry->extension_treatment=IgnoreExtensionTreatment; entry->coder_class=PrimaryCoderClass; (void) RegisterMagickInfo(entry); @@ -5115,6 +5116,7 @@ entry->stealth=True; entry->description="Internal format"; entry->module="LOGO"; + entry->extension_treatment=IgnoreExtensionTreatment; entry->coder_class=PrimaryCoderClass; (void) RegisterMagickInfo(entry); @@ -5123,6 +5125,7 @@ entry->adjoin=False; entry->description="GraphicsMagick Embedded Image"; entry->module="LOGO"; + entry->extension_treatment=IgnoreExtensionTreatment; entry->coder_class=PrimaryCoderClass; (void) RegisterMagickInfo(entry); @@ -5133,6 +5136,7 @@ entry->stealth=True; entry->description="GraphicsMagick Logo"; entry->module="LOGO"; + entry->extension_treatment=IgnoreExtensionTreatment; entry->coder_class=PrimaryCoderClass; (void) RegisterMagickInfo(entry); @@ -5142,6 +5146,7 @@ entry->stealth=True; entry->description="Netscape 216 color cube"; entry->module="LOGO"; + entry->extension_treatment=IgnoreExtensionTreatment; entry->coder_class=PrimaryCoderClass; (void) RegisterMagickInfo(entry); @@ -5151,6 +5156,7 @@ entry->stealth=True; entry->description="Tiled pattern image"; entry->module="LOGO"; + entry->extension_treatment=IgnoreExtensionTreatment; entry->coder_class=PrimaryCoderClass; (void) RegisterMagickInfo(entry); @@ -5159,6 +5165,7 @@ entry->adjoin=False; entry->stealth=True; entry->description="70x46 Truecolor rose"; + entry->extension_treatment=IgnoreExtensionTreatment; entry->module="LOGO"; entry->coder_class=PrimaryCoderClass; (void) RegisterMagickInfo(entry); diff -r 3136789dc62e -r 84185c5ed68b magick/render.c --- a/magick/render.c Fri Nov 25 13:50:32 2022 -0600 +++ b/magick/render.c Sat Nov 26 16:38:03 2022 -0600 @@ -6183,7 +6183,15 @@ status=MagickFail; break; } - if ((primitive_info[1].point.x != composite_image->columns) && + /* + If the requested size is not 0x0 (to be filled in later with + composite image size) and the requested size is different than + the composite image size, then transform to the requested + size. + */ + if ((0 != primitive_info[1].point.x) && + (0 != primitive_info[1].point.y) && + (primitive_info[1].point.x != composite_image->columns) && (primitive_info[1].point.y != composite_image->rows)) { char diff -r 3136789dc62e -r 84185c5ed68b magick/version.h --- a/magick/version.h Fri Nov 25 13:50:32 2022 -0600 +++ b/magick/version.h Sat Nov 26 16:38:03 2022 -0600 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x272400 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 27,24,0 -#define MagickChangeDate "20221125" -#define MagickReleaseDate "snapshot-20221125" +#define MagickChangeDate "20221126" +#define MagickReleaseDate "snapshot-20221126" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r 3136789dc62e -r 84185c5ed68b magick/xwindow.c --- a/magick/xwindow.c Fri Nov 25 13:50:32 2022 -0600 +++ b/magick/xwindow.c Sat Nov 26 16:38:03 2022 -0600 @@ -2223,7 +2223,7 @@ value=x-32; if (x < 112) value=x/2+24; - /* Cast to unsigned added below to avoid undefined + /* FIXME: Cast to unsigned added below to avoid undefined behavior. Not sure if result is what was expected! */ value+=((magick_uint32_t) dither_blue[i][j] << 1); blue_map[i][j][x]=(unsigned char) diff -r 3136789dc62e -r 84185c5ed68b utilities/tests/convert-cmds.txt --- a/utilities/tests/convert-cmds.txt Fri Nov 25 13:50:32 2022 -0600 +++ b/utilities/tests/convert-cmds.txt Sat Nov 26 16:38:03 2022 -0600 @@ -25,6 +25,8 @@ -crop 600x700+100+100 -cycle 200 -despeckle +-fill green -stroke gold -draw 'point 800,500' +-fill green -stroke gold -draw 'line 800,500 1100,800' -fill none -stroke gold -draw 'circle 800,500 1100,800' -fill green -stroke gold -draw 'circle 800,500 1100,800' -fill none -stroke gold -draw 'rectangle 400,200 1100,800' @@ -35,6 +37,25 @@ -fill blue -stroke gold -draw 'polygon 400,200 1100,800 100,300' -fill none -stroke gold -draw 'Bezier 400,200 1100,800 100,300' -fill blue -stroke gold -draw 'Bezier 400,200 1100,800 100,300' +-draw 'image Over 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image In 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Out 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Atop 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Xor 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Plus 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Minus 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Over 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Add 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Subtract 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Difference 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Divide 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Multiply 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Bumpmap 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image Copy 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image CopyRed 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image CopyGreen 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image CopyBlue 120,150 0,0 "${SUNRISE_MIFF}"' +-draw 'image CopyOpacity 120,150 0,0 "${SUNRISE_MIFF}"' -edge 0x1 -emboss 0x1 -enhance diff -r 3136789dc62e -r 84185c5ed68b utilities/tests/convert.tap --- a/utilities/tests/convert.tap Fri Nov 25 13:50:32 2022 -0600 +++ b/utilities/tests/convert.tap Sat Nov 26 16:38:03 2022 -0600 @@ -13,7 +13,7 @@ # Number of tests we plan to execute test_plan_fn ${count} -cat ${commands} | while read subcommand +cat ${commands} | sed -e "s:\${SUNRISE_MIFF}:${SUNRISE_MIFF}:g" | while read subcommand do #set -x eval test_command_fn "\"${subcommand}\"" ${GM} convert -size 1000x1000 pattern:bricks ${subcommand} info:- diff -r 3136789dc62e -r 84185c5ed68b www/Changelog.html --- a/www/Changelog.html Fri Nov 25 13:50:32 2022 -0600 +++ b/www/Changelog.html Sat Nov 26 16:38:03 2022 -0600 @@ -37,6 +37,17 @@ </div> <div class="document"> +<p>2022-11-26 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>coders/logo.c (RegisterLOGOImage): Logo image subformats do not +have an image extension.</p></li> +<li><p>utilities/tests/convert-cmds.txt: Add more convert tests.</p></li> +<li><p>magick/render.c (DrawPrimitive): Fix for SourceForge issue #679 +"Using "0,0" for image size throws an error in v1.3.38, worked +previously". This bug was added in GraphicsMagick 1.3.36.</p></li> +</ul> +</blockquote> <p>2022-11-25 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">