[GM-commit] GraphicsMagick: 3 new changesets
Swiss army knife of image processing
Brought to you by:
bfriesen
Menu
▾
▴
[GM-commit] GraphicsMagick: 3 new changesets
|
From: GraphicsMagick C. <gra...@li...> - 2015-11-07 20:49:41
|
changeset ff542eabc162 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=ff542eabc162 summary: Merge changes for 1.3.23 release. changeset 4e0a7a93d9a4 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=4e0a7a93d9a4 summary: Update generated files. changeset 33200fc645f6 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=33200fc645f6 summary: Added tag GraphicsMagick-1_3_23 for changeset 4e0a7a93d9a4 diffstat: .hgtags | 1 + ChangeLog | 70 ++ Magick++/demo/demos.tap | 18 +- Makefile.in | 120 ++-- NEWS.txt | 76 ++- PerlMagick/Magick.pm | 2 +- VisualMagick/installer/inc/version.isx | 4 +- aclocal.m4 | 67 +- coders/png.c | 12 +- configure | 92 +-- configure.ac | 79 +-- doc/animate.imdoc | 2 +- doc/compare.imdoc | 2 +- doc/composite.imdoc | 3 +- doc/conjure.imdoc | 2 +- doc/convert.imdoc | 3 +- doc/display.imdoc | 2 +- doc/identify.imdoc | 2 +- doc/import.imdoc | 2 +- doc/mogrify.imdoc | 2 +- doc/montage.imdoc | 2 +- magick/animate.c | 4 +- magick/command.c | 17 +- magick/resize.c | 22 +- magick/studio.h | 4 +- magick/version.h | 10 +- utilities/gm.1 | 2 +- version.sh | 10 +- www/Changelog.html | 89 +++ www/Changes.html | 2 +- www/Changes.rst | 4 +- www/Magick++/Image.html | 886 ++++++++++++++++---------------- www/Magick++/Image.rst | 4 +- www/NEWS.html | 172 ++++- www/animate.html | 2 +- www/compare.html | 2 +- www/composite.html | 3 +- www/conjure.html | 2 +- www/convert.html | 3 +- www/display.html | 2 +- www/identify.html | 2 +- www/import.html | 2 +- www/index.html | 2 +- www/index.rst | 2 +- www/mogrify.html | 2 +- www/montage.html | 2 +- 46 files changed, 1048 insertions(+), 767 deletions(-) diffs (truncated from 4355 to 300 lines): diff -r 440e4af32d1e -r 33200fc645f6 .hgtags --- a/.hgtags Sun Oct 04 14:32:51 2015 -0500 +++ b/.hgtags Sat Nov 07 14:49:16 2015 -0600 @@ -86,3 +86,4 @@ 47587edd7953c81c1c85f09eafc060c983c18188 GraphicsMagick-1_3_20 fc472f96dae726f21cb1c7699a535cb55fdfb290 GraphicsMagick-1_3_21 0c27524abb7dc39af605c21970914df676e43ec5 GraphicsMagick-1_3_22 +4e0a7a93d9a4fae31226a706fadc12a6c275e484 GraphicsMagick-1_3_23 diff -r 440e4af32d1e -r 33200fc645f6 ChangeLog --- a/ChangeLog Sun Oct 04 14:32:51 2015 -0500 +++ b/ChangeLog Sat Nov 07 14:49:16 2015 -0600 @@ -1,3 +1,73 @@ +2015-11-07 Bob Friesenhahn <bfr...@si...> + + * NEWS.txt: Update NEWS for 1.3.23 release. + +2015-11-06 Bob Friesenhahn <bfr...@si...> + + * magick/command.c (IdentifyImageCommand): Fix problem that + identify with -format "%A" does not always report correct answer + due to insufficient analysis of image. Fixes SourceForge bug #326 + "gm identify: transparency detection bug ". + +2015-11-05 Glenn Randers-Pehrson <gl...@si...> + + * coders/png.c (WriteOnePNGImage): Restored a "volatile" + declaration that was accidentally deleted on 2015-11-03. + +2015-11-04 Bob Friesenhahn <bfr...@si...> + + * configure.ac: Add checks for 'ps2write' and 'eps2write' as + Ghostscript Postscript and Encapsulated Postscript + writers. Resolves issue reported to graphicsmagick-bugs mailing + list on 2015-11-01 entitled "Failure to detect pswrite and + epswrite Ghostscript devices". + +2015-11-03 Glenn Randers-Pehrson <gl...@si...> + + * coders/png.c (ReadRawProfile): Issue a warning instead of + an error when attempting to read a zero-length profile. + +2015-11-01 Bob Friesenhahn <bfr...@si...> + + * magick/studio.h (MagickSleep): Provide the macro 'MagickSleep' + to call a function which delays for one second. No longer provide + a macro 'sleep' in WIN32 compiles. Resolves issue reported to + graphicsmagick-bugs mailing list on 2005-11-01 entitled "MinGW + build error when sleep re#defined as Sleep". + +2015-10-30 Bob Friesenhahn <bfr...@si...> + + * Magick++/demo/demos.tap: Add zoom test cases to test resize to + original dimensions, change height, and change width. + + * magick/resize.c (ScaleImage): Fix regression introduced in + 1.3.22 release which results in pixel cache not open if the scale + width and height match the original. Patch by Troy Patteson. + Fixes part of SourceForge bug #323 "ScaleImage() issues in + v1.3.22". + (ScaleImage): Fix double free problem when scaled rows equals + original rows. This regression was added in the 1.3.22 release + via changset 080b99bba574. Based on patch by Troy Patteson. + Fixes remaining part SourceForge bug #323 "ScaleImage() issues in + v1.3.22". + +2015-10-24 Bob Friesenhahn <bfr...@si...> + + * www/Magick++/Image.rst (thumbnail): Paragraph heading fix. + Resolves SourceForge issue #321 "find tiny error in + Magick++/Image.html document". + +2015-10-06 Glenn Randers-Pehrson <gl...@si...> + + * docs/*.imdoc: Changed synopses in manpages to add "gm " + prefix to commands. Updated synopsis for "convert" to agree + with what's in the "gm" manpage. + +2015-10-05 Bob Friesenhahn <bfr...@si...> + + * configure.ac: Remove CFLAGS and LDFLAGS deduplication code. + Resolves SourceForge bug #320 OS X "universal build failure". + 2015-10-04 Bob Friesenhahn <bfr...@si...> * www/index.rst: Updated for 1.3.22 release. diff -r 440e4af32d1e -r 33200fc645f6 Magick++/demo/demos.tap --- a/Magick++/demo/demos.tap Sun Oct 04 14:32:51 2015 -0500 +++ b/Magick++/demo/demos.tap Sat Nov 07 14:49:16 2015 -0600 @@ -1,7 +1,7 @@ #!/bin/sh # -*- shell-script -*- # -# Copyright 2004-2012 Bob Friesenhahn <bfr...@si...> +# Copyright 2004-2015 Bob Friesenhahn <bfr...@si...> # # This file is part of Magick++, the C++ API for GraphicsMagick and # ImageMagick. Please see the file "COPYING" included with Magick++ @@ -15,7 +15,7 @@ export SRCDIR # Number of tests we plan to run -test_plan_fn 24 +test_plan_fn 75 cd ${subdir} || exit 1 @@ -27,8 +27,22 @@ test_command_fn "gravity" -F TTF ${MEMCHECK} ./gravity test_command_fn "piddle" -F TTF ${MEMCHECK} ./piddle test_command_fn "shapes" -F TTF ${MEMCHECK} ./shapes +ORIG_WIDTH=`${GM} identify -format "%w" ${SRCDIR}/model.miff` +ORIG_HEIGHT=`${GM} identify -format "%h" ${SRCDIR}/model.miff` for filter in bessel blackman box catrom cubic gaussian hamming hanning hermite lanczos mitchell point quadratic sample scale sinc triangle do test_command_fn "zoom ${filter}" ${MEMCHECK} ./zoom -filter $filter -geometry 600x600 ${SRCDIR}/model.miff zoom_${filter}_out.miff done +for filter in bessel blackman box catrom cubic gaussian hamming hanning hermite lanczos mitchell point quadratic sample scale sinc triangle +do + test_command_fn "zoom ${filter} (Copy)" ${MEMCHECK} ./zoom -filter $filter -geometry "${ORIG_WIDTH}x${ORIG_HEIGHT}" ${SRCDIR}/model.miff zoom_${filter}_nc_out.miff +done +for filter in bessel blackman box catrom cubic gaussian hamming hanning hermite lanczos mitchell point quadratic sample scale sinc triangle +do + test_command_fn "zoom ${filter} (Width)" ${MEMCHECK} ./zoom -filter $filter -geometry "600x${ORIG_HEIGHT}!" ${SRCDIR}/model.miff zoom_${filter}_cw_out.miff +done +for filter in bessel blackman box catrom cubic gaussian hamming hanning hermite lanczos mitchell point quadratic sample scale sinc triangle +do + test_command_fn "zoom ${filter} (Height)" ${MEMCHECK} ./zoom -filter $filter -geometry "${ORIG_WIDTH}x600!" ${SRCDIR}/model.miff zoom_${filter}_ch_out.miff +done : diff -r 440e4af32d1e -r 33200fc645f6 Makefile.in --- a/Makefile.in Sun Oct 04 14:32:51 2015 -0500 +++ b/Makefile.in Sat Nov 07 14:49:16 2015 -0600 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +142,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -210,46 +220,6 @@ $(WAND_TESTS) $(UTILITIES_TESTS) XFAIL_TESTS = $(am__EXEEXT_7) $(am__EXEEXT_7) $(am__EXEEXT_7) check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_5) -DIST_COMMON = $(srcdir)/config/Makefile.am \ - $(srcdir)/coders/Makefile.am $(srcdir)/magick/Makefile.am \ - $(srcdir)/filters/Makefile.am $(srcdir)/Magick++/Makefile.am \ - $(srcdir)/tests/Makefile.am $(srcdir)/wand/Makefile.am \ - $(srcdir)/www/Makefile.am $(srcdir)/www/api/Makefile.am \ - $(srcdir)/www/wand/Makefile.am $(srcdir)/utilities/Makefile.am \ - $(srcdir)/PerlMagick/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(top_srcdir)/magick/magick_config.h.in \ - $(top_srcdir)/magick/magick_config_api.h.in \ - $(srcdir)/GraphicsMagick.spec.in \ - $(top_srcdir)/Magick++/bin/GraphicsMagick++-config.in \ - $(top_srcdir)/Magick++/lib/GraphicsMagick++.pc.in \ - $(top_srcdir)/PerlMagick/Magick.pm.in \ - $(top_srcdir)/PerlMagick/Makefile.PL.in \ - $(top_srcdir)/PerlMagick/PerlMagickCheck.sh.in \ - $(top_srcdir)/config/delegates.mgk.in \ - $(top_srcdir)/config/type-ghostscript.mgk.in \ - $(top_srcdir)/config/type-solaris.mgk.in \ - $(top_srcdir)/config/type-windows.mgk.in \ - $(top_srcdir)/config/type.mgk.in \ - $(top_srcdir)/magick/GraphicsMagick-config.in \ - $(top_srcdir)/magick/GraphicsMagick.pc.in \ - $(top_srcdir)/magick/magick_types.h.in \ - $(top_srcdir)/magick/version.h.in $(srcdir)/common.shi.in \ - $(srcdir)/rungm.sh.in \ - $(top_srcdir)/wand/GraphicsMagickWand-config.in \ - $(top_srcdir)/wand/GraphicsMagickWand.pc.in \ - $(top_srcdir)/config/depcomp $(include_HEADERS) \ - $(magickinc_HEADERS) $(am__magickppinc_HEADERS_DIST) \ - $(am__magickpptopinc_HEADERS_DIST) $(noinst_HEADERS) \ - $(wandinc_HEADERS) $(top_srcdir)/config/test-driver ChangeLog \ - config/compile config/config.guess config/config.sub \ - config/depcomp config/install-sh config/missing mkinstalldirs \ - config/ltmain.sh $(top_srcdir)/config/compile \ - $(top_srcdir)/config/config.guess \ - $(top_srcdir)/config/config.sub \ - $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ - $(top_srcdir)/config/missing \ - $(top_srcdir)/config/tap-driver.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ @@ -258,6 +228,11 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(include_HEADERS) $(magickinc_HEADERS) \ + $(am__magickppinc_HEADERS_DIST) \ + $(am__magickpptopinc_HEADERS_DIST) $(noinst_HEADERS) \ + $(wandinc_HEADERS) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -2012,6 +1987,42 @@ TEST_LOGS = $(am__test_logs3:.tap.log=.log) TAP_LOG_COMPILE = $(TAP_LOG_COMPILER) $(AM_TAP_LOG_FLAGS) \ $(TAP_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/GraphicsMagick.spec.in \ + $(srcdir)/Magick++/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/PerlMagick/Makefile.am $(srcdir)/coders/Makefile.am \ + $(srcdir)/common.shi.in $(srcdir)/config/Makefile.am \ + $(srcdir)/filters/Makefile.am $(srcdir)/magick/Makefile.am \ + $(srcdir)/rungm.sh.in $(srcdir)/tests/Makefile.am \ + $(srcdir)/utilities/Makefile.am $(srcdir)/wand/Makefile.am \ + $(srcdir)/www/Makefile.am $(srcdir)/www/api/Makefile.am \ + $(srcdir)/www/wand/Makefile.am \ + $(top_srcdir)/Magick++/bin/GraphicsMagick++-config.in \ + $(top_srcdir)/Magick++/lib/GraphicsMagick++.pc.in \ + $(top_srcdir)/PerlMagick/Magick.pm.in \ + $(top_srcdir)/PerlMagick/Makefile.PL.in \ + $(top_srcdir)/PerlMagick/PerlMagickCheck.sh.in \ + $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ + $(top_srcdir)/config/config.sub \ + $(top_srcdir)/config/delegates.mgk.in \ + $(top_srcdir)/config/depcomp $(top_srcdir)/config/install-sh \ + $(top_srcdir)/config/ltmain.sh $(top_srcdir)/config/missing \ + $(top_srcdir)/config/tap-driver.sh \ + $(top_srcdir)/config/test-driver \ + $(top_srcdir)/config/type-ghostscript.mgk.in \ + $(top_srcdir)/config/type-solaris.mgk.in \ + $(top_srcdir)/config/type-windows.mgk.in \ + $(top_srcdir)/config/type.mgk.in \ + $(top_srcdir)/magick/GraphicsMagick-config.in \ + $(top_srcdir)/magick/GraphicsMagick.pc.in \ + $(top_srcdir)/magick/magick_config.h.in \ + $(top_srcdir)/magick/magick_config_api.h.in \ + $(top_srcdir)/magick/magick_types.h.in \ + $(top_srcdir)/magick/version.h.in \ + $(top_srcdir)/wand/GraphicsMagickWand-config.in \ + $(top_srcdir)/wand/GraphicsMagickWand.pc.in ChangeLog \ + config/compile config/config.guess config/config.sub \ + config/depcomp config/install-sh config/ltmain.sh \ + config/missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -4457,7 +4468,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -4467,7 +4477,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/config/Makefile.am $(srcdir)/coders/Makefile.am $(srcdir)/magick/Makefile.am $(srcdir)/filters/Makefile.am $(srcdir)/Magick++/Makefile.am $(srcdir)/tests/Makefile.am $(srcdir)/wand/Makefile.am $(srcdir)/www/Makefile.am $(srcdir)/www/api/Makefile.am $(srcdir)/www/wand/Makefile.am $(srcdir)/utilities/Makefile.am $(srcdir)/PerlMagick/Makefile.am: +$(srcdir)/config/Makefile.am $(srcdir)/coders/Makefile.am $(srcdir)/magick/Makefile.am $(srcdir)/filters/Makefile.am $(srcdir)/Magick++/Makefile.am $(srcdir)/tests/Makefile.am $(srcdir)/wand/Makefile.am $(srcdir)/www/Makefile.am $(srcdir)/www/api/Makefile.am $(srcdir)/www/wand/Makefile.am $(srcdir)/utilities/Makefile.am $(srcdir)/PerlMagick/Makefile.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -9283,7 +9293,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -9479,15 +9489,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) |
