GraphicsMagick: 2 new changesets
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.76580.1626473632.1503.graphicsmagick-commit@lists.sourceforge.net> |
changeset a4101237c551 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=a4101237c551 summary: Start providing helpful lists of OS distribution packages. changeset 62ccf4325652 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=62ccf4325652 summary: JP2: Update for the latest version of the evolving jas_init_custom() interface provided by the mdadams-callbacks branch. diffstat: ChangeLog | 6 +++ VisualMagick/installer/inc/version.isx | 4 +- coders/jp2.c | 22 ++++++++---- magick/version.h | 4 +- www/Changelog.html | 5 ++ www/INSTALL-unix.html | 57 +++++++++++++++++++++++++-------- www/INSTALL-unix.rst | 32 +++++++++++++++++++ 7 files changed, 104 insertions(+), 26 deletions(-) diffs (258 lines): diff -r 9753d715e6db -r 62ccf4325652 ChangeLog --- a/ChangeLog Mon Jul 05 15:14:27 2021 -0500 +++ b/ChangeLog Fri Jul 16 17:13:38 2021 -0500 @@ -1,3 +1,9 @@ +2021-07-16 Bob Friesenhahn <[email protected]> + + * coders/jp2.c (initialize_jasper): Update for the latest version + of the evolving jas_init_custom() interface provided by the + mdadams-callbacks branch. + 2021-07-05 Bob Friesenhahn <[email protected]> * coders/jp2.c: Assure that the designated decoder is used rather diff -r 9753d715e6db -r 62ccf4325652 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Mon Jul 05 15:14:27 2021 -0500 +++ b/VisualMagick/installer/inc/version.isx Fri Jul 16 17:13:38 2021 -0500 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020210705" -#define public MagickPackageReleaseDate "snapshot-20210705" +#define public MagickPackageVersionAddendum ".020210716" +#define public MagickPackageReleaseDate "snapshot-20210716" diff -r 9753d715e6db -r 62ccf4325652 coders/jp2.c --- a/coders/jp2.c Mon Jul 05 15:14:27 2021 -0500 +++ b/coders/jp2.c Fri Jul 16 17:13:38 2021 -0500 @@ -422,18 +422,24 @@ if (!jasper_initialized) { #if HAVE_JAS_INIT_CUSTOM - jas_allocator_t jas_allocator; jas_conf_t jas_conf; - (void) memset(&jas_allocator,0,sizeof(jas_allocator)); - (void) memset(&jas_conf,0,sizeof(jas_conf)); + /* Get the default configuration parameters that were selected at + when the library was built. */ + jas_get_default_conf(&jas_conf); - jas_allocator.alloc = _MagickAllocateResourceLimitedMemory; - jas_allocator.free = _MagickFreeResourceLimitedMemory; - jas_allocator.realloc = _MagickReallocateResourceLimitedMemoryTraditional; + /* Use our own resource-limited memory allocation functions */ + jas_conf.allocator.alloc = _MagickAllocateResourceLimitedMemory; + jas_conf.allocator.free = _MagickFreeResourceLimitedMemory; + jas_conf.allocator.realloc = _MagickReallocateResourceLimitedMemoryTraditional; + /* The maximum number of samples allowable in an image to be decoded. */ jas_conf.dec_default_max_samples = JAS_DEC_DEFAULT_MAX_SAMPLES; - (void) jas_init_custom(&jas_allocator,&jas_conf); + + /* Do not register jas_cleanup() via atexit() */ + jas_conf.atexit_cleanup = false; + + (void) jas_init_custom(&jas_conf); #else jas_init(); #endif /* HAVE_JAS_INIT_CUSTOM */ @@ -1042,7 +1048,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Method UnregisterJP2Image removes format registrations made by the -% PNG module from the list of supported formats. +% JP2 module from the list of supported formats. % % The format of the UnregisterJP2Image method is: % diff -r 9753d715e6db -r 62ccf4325652 magick/version.h --- a/magick/version.h Mon Jul 05 15:14:27 2021 -0500 +++ b/magick/version.h Fri Jul 16 17:13:38 2021 -0500 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x252200 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 25,22,0 -#define MagickChangeDate "20210705" -#define MagickReleaseDate "snapshot-20210705" +#define MagickChangeDate "20210716" +#define MagickReleaseDate "snapshot-20210716" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r 9753d715e6db -r 62ccf4325652 www/Changelog.html --- a/www/Changelog.html Mon Jul 05 15:14:27 2021 -0500 +++ b/www/Changelog.html Fri Jul 16 17:13:38 2021 -0500 @@ -35,6 +35,11 @@ <div class="document"> +<p>2021-07-16 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> +* coders/jp2.c (initialize_jasper): Update for the latest version +of the evolving jas_init_custom() interface provided by the +mdadams-callbacks branch.</blockquote> <p>2021-07-05 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> * coders/jp2.c: Assure that the designated decoder is used rather diff -r 9753d715e6db -r 62ccf4325652 www/INSTALL-unix.html --- a/www/INSTALL-unix.html Mon Jul 05 15:14:27 2021 -0500 +++ b/www/INSTALL-unix.html Fri Jul 16 17:13:38 2021 -0500 @@ -46,15 +46,19 @@ <li><a class="reference internal" href="#optional-packages-options" id="id4">Optional Packages/Options</a></li> </ul> </li> -<li><a class="reference internal" href="#building-under-cygwin" id="id5">Building under Cygwin</a></li> -<li><a class="reference internal" href="#building-under-mingw-msys2" id="id6">Building under MinGW & MSYS2</a><ul> -<li><a class="reference internal" href="#cross-compilation-on-unix-linux-host" id="id7">Cross-compilation On Unix/Linux Host</a></li> +<li><a class="reference internal" href="#popular-distribution-packages" id="id5">Popular Distribution Packages</a><ul> +<li><a class="reference internal" href="#debian-packages" id="id6">Debian Packages</a></li> </ul> </li> -<li><a class="reference internal" href="#dealing-with-configuration-failures" id="id8">Dealing with configuration failures</a></li> -<li><a class="reference internal" href="#makefile-build-targets" id="id9">Makefile Build Targets</a></li> -<li><a class="reference internal" href="#build-install" id="id10">Build & Install</a></li> -<li><a class="reference internal" href="#verifying-the-build" id="id11">Verifying The Build</a></li> +<li><a class="reference internal" href="#building-under-cygwin" id="id7">Building under Cygwin</a></li> +<li><a class="reference internal" href="#building-under-mingw-msys2" id="id8">Building under MinGW & MSYS2</a><ul> +<li><a class="reference internal" href="#cross-compilation-on-unix-linux-host" id="id9">Cross-compilation On Unix/Linux Host</a></li> +</ul> +</li> +<li><a class="reference internal" href="#dealing-with-configuration-failures" id="id10">Dealing with configuration failures</a></li> +<li><a class="reference internal" href="#makefile-build-targets" id="id11">Makefile Build Targets</a></li> +<li><a class="reference internal" href="#build-install" id="id12">Build & Install</a></li> +<li><a class="reference internal" href="#verifying-the-build" id="id13">Verifying The Build</a></li> </ul> </div> <div class="section" id="archive-formats"> @@ -893,8 +897,33 @@ </table> </div> </div> +<div class="section" id="popular-distribution-packages"> +<h1><a class="toc-backref" href="#id5">Popular Distribution Packages</a></h1> +<p>We will attempt to document the package names useful for +GraphicsMagick on various primordial operating system distributions +here.</p> +<div class="section" id="debian-packages"> +<h2><a class="toc-backref" href="#id6">Debian Packages</a></h2> +<p>These packages may be installed on a Debian Linux system (or one that +derives from Debian such as Ubuntu or Mint) in order to quickly build +a full GraphicsMagick. Most of these are optional depending on the +features desired:</p> +<p>gcc (and/or clang), make, +libbz2-dev, libfreetype6-dev, libjbig-dev, liblcms2-dev, liblzma-dev, +libpng-dev, libtiff-dev, libtool, libwebp-dev, libwmf-dev, libx11-dev, +libxdmcp-dev, libxext-dev, libxft-dev, libxml2-dev, libxt-dev, +libzstd-dev, zlib1g-dev, libperl-dev</p> +<p>These additional packages are useful in order to improve the run-time +features of the software (and could be installed prior to building +GraphicsMagick):</p> +<p>dcraw, fonts-urw-base35, ghostscript, hp2xx, ttf-mscorefonts-installer</p> +<p>These additional packages are useful in order to maintain +GraphicsMagick itself:</p> +<p>autoconf, automake, graphviz, libtool, docutils-common, python, m4</p> +</div> +</div> <div class="section" id="building-under-cygwin"> -<h1><a class="toc-backref" href="#id5">Building under Cygwin</a></h1> +<h1><a class="toc-backref" href="#id7">Building under Cygwin</a></h1> <p>GraphicsMagick may be built under the Windows '95-XP Cygwin Unix-emulation environment available for free from</p> <blockquote> @@ -916,7 +945,7 @@ are working properly.</p> </div> <div class="section" id="building-under-mingw-msys2"> -<h1><a class="toc-backref" href="#id6">Building under MinGW & MSYS2</a></h1> +<h1><a class="toc-backref" href="#id8">Building under MinGW & MSYS2</a></h1> <p>GraphicsMagick may easily be built using the free <a class="reference external" href="https://www.msys2.org/">MSYS2</a> distribution which provides GCC compilers, libraries, and headers, targeting native Windows along with a Unix-like command shell and a package manager ('Pacman') to install @@ -1004,7 +1033,7 @@ which may be embedded in libraries and configuration files are transformed into Windows paths so they don't depend on MSYS.</p> <div class="section" id="cross-compilation-on-unix-linux-host"> -<h2><a class="toc-backref" href="#id7">Cross-compilation On Unix/Linux Host</a></h2> +<h2><a class="toc-backref" href="#id9">Cross-compilation On Unix/Linux Host</a></h2> <p>Given a modern and working MinGW32 or mingw-w64 installation, it is easy to cross-compile GraphicsMagick from a Unix-type host to produce Microsoft Windows executables.</p> @@ -1041,7 +1070,7 @@ </div> </div> <div class="section" id="dealing-with-configuration-failures"> -<h1><a class="toc-backref" href="#id8">Dealing with configuration failures</a></h1> +<h1><a class="toc-backref" href="#id10">Dealing with configuration failures</a></h1> <p>While configure is designed to ease installation of GraphicsMagick, it often discovers problems that would otherwise be encountered later when compiling GraphicsMagick. The configure script tests for headers @@ -1077,7 +1106,7 @@ why) so the failure you are observing can be identified and resolved.</p> </div> <div class="section" id="makefile-build-targets"> -<h1><a class="toc-backref" href="#id9">Makefile Build Targets</a></h1> +<h1><a class="toc-backref" href="#id11">Makefile Build Targets</a></h1> <p>Once GraphicsMagick is configured, these standard build targets are available from the generated Makefiles:</p> <blockquote> @@ -1112,7 +1141,7 @@ </blockquote> </div> <div class="section" id="build-install"> -<h1><a class="toc-backref" href="#id10">Build & Install</a></h1> +<h1><a class="toc-backref" href="#id12">Build & Install</a></h1> <p>Now that GraphicsMagick is configured, type</p> <pre class="literal-block"> make @@ -1130,7 +1159,7 @@ </pre> </div> <div class="section" id="verifying-the-build"> -<h1><a class="toc-backref" href="#id11">Verifying The Build</a></h1> +<h1><a class="toc-backref" href="#id13">Verifying The Build</a></h1> <p>To confirm your installation of the GraphicsMagick distribution was successful, ensure that the installation directory is in your executable search path and type</p> diff -r 9753d715e6db -r 62ccf4325652 www/INSTALL-unix.rst --- a/www/INSTALL-unix.rst Mon Jul 05 15:14:27 2021 -0500 +++ b/www/INSTALL-unix.rst Fri Jul 16 17:13:38 2021 -0500 @@ -805,6 +805,38 @@ the default libc memory allocator, and more performant in multi-threaded programs than umem, but is less memory efficient. +Popular Distribution Packages +----------------------------- + +We will attempt to document the package names useful for +GraphicsMagick on various primordial operating system distributions +here. + +Debian Packages +~~~~~~~~~~~~~~~ + +These packages may be installed on a Debian Linux system (or one that +derives from Debian such as Ubuntu or Mint) in order to quickly build +a full GraphicsMagick. Most of these are optional depending on the +features desired: + +gcc (and/or clang), make, +libbz2-dev, libfreetype6-dev, libjbig-dev, liblcms2-dev, liblzma-dev, +libpng-dev, libtiff-dev, libtool, libwebp-dev, libwmf-dev, libx11-dev, +libxdmcp-dev, libxext-dev, libxft-dev, libxml2-dev, libxt-dev, +libzstd-dev, zlib1g-dev, libperl-dev + +These additional packages are useful in order to improve the run-time +features of the software (and could be installed prior to building +GraphicsMagick): + +dcraw, fonts-urw-base35, ghostscript, hp2xx, ttf-mscorefonts-installer + +These additional packages are useful in order to maintain +GraphicsMagick itself: + +autoconf, automake, graphviz, libtool, docutils-common, python, m4 + Building under Cygwin ---------------------