From 1f9e1edef88f3d6b9f37af9289c7eeeb8165feb1 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 18 Nov 2009 04:09:38 +0000 Subject: [PATCH] --- Makefile.in | 147 ++++++------------------- coders/emf.c | 3 +- coders/svg.c | 63 ++++++----- config/configure.xml | 2 +- config/ltmain.sh | 8 +- configure | 4 +- index.html | 8 +- libtool | 12 +- ltdl/Makefile.inc | 40 +++---- ltdl/ltdl.c | 5 +- m4/ltversion.m4 | 10 +- magick/studio.h | 2 +- magick/version.h | 2 +- wand/mogrify.c | 2 +- wand/studio.h | 2 +- www/ImageMagickObject.html | 6 +- www/advanced-unix-installation.html | 10 +- www/advanced-windows-installation.html | 8 +- www/animate.html | 8 +- www/api.html | 46 ++++---- www/api/animate.html | 4 + www/api/annotate.html | 7 ++ www/api/attribute.html | 8 +- www/api/blob.html | 6 +- www/api/cache-view.html | 6 +- www/api/cache.html | 9 +- www/api/cipher.html | 6 +- www/api/color.html | 6 +- www/api/compare.html | 6 +- www/api/composite.html | 5 +- www/api/constitute.html | 6 +- www/api/decorate.html | 4 + www/api/deprecate.html | 6 +- www/api/display.html | 6 +- www/api/distort.html | 8 +- www/api/draw.html | 6 +- www/api/drawing-wand.html | 4 + www/api/effect.html | 9 +- www/api/enhance.html | 6 +- www/api/exception.html | 9 +- www/api/fx.html | 6 +- www/api/histogram.html | 4 + www/api/image.html | 9 +- www/api/layer.html | 6 +- www/api/list.html | 6 +- www/api/magick-deprecate.html | 6 +- www/api/magick-image.html | 6 +- www/api/magick-property.html | 6 +- www/api/magick-wand.html | 4 + www/api/magick.html | 6 +- www/api/memory.html | 7 ++ www/api/module.html | 4 + www/api/monitor.html | 8 +- www/api/montage.html | 7 ++ www/api/paint.html | 8 +- www/api/pixel-iterator.html | 4 + www/api/pixel-view.html | 4 + www/api/pixel-wand.html | 6 +- www/api/profile.html | 8 +- www/api/property.html | 8 +- www/api/quantize.html | 6 +- www/api/registry.html | 6 +- www/api/resize.html | 9 +- www/api/resource.html | 9 +- www/api/segment.html | 4 + www/api/shear.html | 8 +- www/api/signature.html | 4 + www/api/stream.html | 4 + www/api/transform.html | 6 +- www/api/version.html | 5 +- www/architecture.html | 6 +- www/binary-releases.html | 52 +++++---- www/changelog.html | 8 +- www/cipher.html | 6 +- www/color.html | 6 +- www/command-line-options.html | 6 +- www/command-line-processing.html | 4 + www/command-line-tools.html | 8 +- www/compare.html | 6 +- www/composite.html | 6 +- www/conjure.html | 4 + www/contact.html | 7 +- www/convert.html | 4 + www/display.html | 4 + www/download.html | 10 +- www/escape.html | 4 + www/examples.html | 6 +- www/exception.html | 8 +- www/formats.html | 6 +- www/fx.html | 8 +- www/high-dynamic-range.html | 8 +- www/history.html | 6 +- www/identify.html | 8 +- www/import.html | 6 +- www/index.html | 8 +- www/install-source.html | 6 +- www/jp2.html | 8 +- www/license.html | 6 +- www/links.html | 102 ++++++++--------- www/magick-core.html | 7 ++ www/magick-vector-graphics.html | 8 +- www/magick-wand.html | 4 + www/mailing-list.html | 14 ++- www/miff.html | 4 + www/mirrors.html | 10 +- www/mogrify.html | 6 +- www/montage.html | 4 + www/motion-picture.html | 8 +- www/perl-magick.html | 6 +- www/quantize.html | 4 + www/resources.html | 8 +- www/search.html | 7 ++ www/sitemap.html | 54 ++++----- www/sponsors.html | 9 +- www/stream.html | 4 + www/subversion.html | 6 +- www/t-shirt.html | 6 +- 117 files changed, 775 insertions(+), 420 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2563d9e41..957bc1d3e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1268,16 +1268,9 @@ ltdl_dyld_la_OBJECTS = $(am_ltdl_dyld_la_OBJECTS) ltdl_dyld_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(ltdl_dyld_la_LDFLAGS) $(LDFLAGS) -o $@ -am_ltdl_libltdl_la_OBJECTS = ltdl/loaders/ltdl_libltdl_la-preopen.lo \ - ltdl/ltdl_libltdl_la-lt__alloc.lo \ - ltdl/ltdl_libltdl_la-lt_dlloader.lo \ - ltdl/ltdl_libltdl_la-lt_error.lo ltdl/ltdl_libltdl_la-ltdl.lo \ - ltdl/ltdl_libltdl_la-slist.lo -ltdl_libltdl_la_OBJECTS = $(am_ltdl_libltdl_la_OBJECTS) -ltdl_libltdl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(ltdl_libltdl_la_LDFLAGS) $(LDFLAGS) \ - -o $@ +ltdl_libltdl_la_LIBADD = +ltdl_libltdl_la_SOURCES = ltdl/libltdl.c +ltdl_libltdl_la_OBJECTS = ltdl/libltdl.lo @INSTALL_LTDL_TRUE@am_ltdl_libltdl_la_rpath = -rpath $(libdir) am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) am__objects_1 = ltdl/loaders/ltdl_libltdlc_la-preopen.lo \ @@ -1971,7 +1964,7 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ $(filters_analyze_la_SOURCES) $(filters_boost_la_SOURCES) \ $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \ - $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \ + $(ltdl_dyld_la_SOURCES) ltdl/libltdl.c \ $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \ $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \ $(magick_libMagickCore_la_SOURCES) \ @@ -2059,7 +2052,7 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ $(filters_analyze_la_SOURCES) $(filters_boost_la_SOURCES) \ $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \ - $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \ + $(ltdl_dyld_la_SOURCES) ltdl/libltdl.c \ $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \ $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \ $(am__magick_libMagickCore_la_SOURCES_DIST) \ @@ -2095,8 +2088,8 @@ MANS = $(man_MANS) DATA = $(configlib_DATA) $(configshare_DATA) $(doc_DATA) \ $(pkgconfig_DATA) am__include_HEADERS_DIST = ltdl/ltdl.h -am__ltdlinclude_HEADERS_DIST = ltdl/libltdl/lt_system.h \ - ltdl/libltdl/lt_error.h ltdl/libltdl/lt_dlloader.h +am__ltdlinclude_HEADERS_DIST = ltdl/ltdl/lt_system.h \ + ltdl/ltdl/lt_error.h ltdl/ltdl/lt_dlloader.h am__magickppinc_HEADERS_DIST = Magick++/lib/Magick++/Blob.h \ Magick++/lib/Magick++/CoderInfo.h \ Magick++/lib/Magick++/Color.h Magick++/lib/Magick++/Drawable.h \ @@ -2702,21 +2695,21 @@ CONFIG_EXTRA_DIST = \ config/type-windows.xml.in \ config/type.xml.in -LTDL_VERSION_INFO = -version-info 9:0:2 +LTDL_VERSION_INFO = -version-info 9:1:2 @INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl -@INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = ltdl/libltdl/lt_system.h \ -@INSTALL_LTDL_TRUE@ ltdl/libltdl/lt_error.h \ -@INSTALL_LTDL_TRUE@ ltdl/libltdl/lt_dlloader.h - -ltdl_libltdl_la_SOURCES = ltdl/libltdl/lt__alloc.h \ - ltdl/libltdl/lt__dirent.h \ - ltdl/libltdl/lt__glibc.h \ - ltdl/libltdl/lt__private.h \ - ltdl/libltdl/lt__strl.h \ - ltdl/libltdl/lt_dlloader.h \ - ltdl/libltdl/lt_error.h \ - ltdl/libltdl/lt_system.h \ - ltdl/libltdl/slist.h \ +@INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = ltdl/ltdl/lt_system.h \ +@INSTALL_LTDL_TRUE@ ltdl/ltdl/lt_error.h \ +@INSTALL_LTDL_TRUE@ ltdl/ltdl/lt_dlloader.h + +ltdl_ltdl_la_SOURCES = ltdl/ltdl/lt__alloc.h \ + ltdl/ltdl/lt__dirent.h \ + ltdl/ltdl/lt__glibc.h \ + ltdl/ltdl/lt__private.h \ + ltdl/ltdl/lt__strl.h \ + ltdl/ltdl/lt_dlloader.h \ + ltdl/ltdl/lt_error.h \ + ltdl/ltdl/lt_system.h \ + ltdl/ltdl/slist.h \ ltdl/loaders/preopen.c \ ltdl/lt__alloc.c \ ltdl/lt_dlloader.c \ @@ -2725,15 +2718,15 @@ ltdl_libltdl_la_SOURCES = ltdl/libltdl/lt__alloc.h \ ltdl/ltdl.h \ ltdl/slist.c -ltdl_libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS) -ltdl_libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(LTDL_VERSION_INFO) $(LT_DLPREOPEN) -ltdl_libltdl_la_LIBADD = $(ltdl_LTLIBOBJS) -ltdl_libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(ltdl_LTLIBOBJS) -ltdl_libltdlc_la_SOURCES = $(ltdl_libltdl_la_SOURCES) +ltdl_ltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS) +ltdl_ltdl_la_LDFLAGS = $(AM_LDFLAGS) $(LTDL_VERSION_INFO) $(LT_DLPREOPEN) +ltdl_ltdl_la_LIBADD = $(ltdl_LTLIBOBJS) +ltdl_ltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(ltdl_LTLIBOBJS) +ltdl_libltdlc_la_SOURCES = $(ltdl_ltdl_la_SOURCES) ltdl_libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS) ltdl_libltdlc_la_LDFLAGS = $(AM_LDFLAGS) $(LT_DLPREOPEN) -ltdl_libltdlc_la_LIBADD = $(ltdl_libltdl_la_LIBADD) -ltdl_libltdlc_la_DEPENDENCIES = $(ltdl_libltdl_la_DEPENDENCIES) +ltdl_libltdlc_la_LIBADD = $(ltdl_ltdl_la_LIBADD) +ltdl_libltdlc_la_DEPENDENCIES = $(ltdl_ltdl_la_DEPENDENCIES) ltdl_dlopen_la_SOURCES = ltdl/loaders/dlopen.c ltdl_dlopen_la_LDFLAGS = -module -avoid-version ltdl_dlopen_la_LIBADD = $(LIBADD_DLOPEN) @@ -5350,23 +5343,12 @@ ltdl/loaders/dyld.lo: ltdl/loaders/$(am__dirstamp) \ ltdl/loaders/$(DEPDIR)/$(am__dirstamp) ltdl/dyld.la: $(ltdl_dyld_la_OBJECTS) $(ltdl_dyld_la_DEPENDENCIES) ltdl/$(am__dirstamp) $(AM_V_CCLD)$(ltdl_dyld_la_LINK) $(ltdl_dyld_la_OBJECTS) $(ltdl_dyld_la_LIBADD) $(LIBS) -ltdl/loaders/ltdl_libltdl_la-preopen.lo: ltdl/loaders/$(am__dirstamp) \ - ltdl/loaders/$(DEPDIR)/$(am__dirstamp) ltdl/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) ltdl/$(DEPDIR) @: > ltdl/$(DEPDIR)/$(am__dirstamp) -ltdl/ltdl_libltdl_la-lt__alloc.lo: ltdl/$(am__dirstamp) \ - ltdl/$(DEPDIR)/$(am__dirstamp) -ltdl/ltdl_libltdl_la-lt_dlloader.lo: ltdl/$(am__dirstamp) \ - ltdl/$(DEPDIR)/$(am__dirstamp) -ltdl/ltdl_libltdl_la-lt_error.lo: ltdl/$(am__dirstamp) \ - ltdl/$(DEPDIR)/$(am__dirstamp) -ltdl/ltdl_libltdl_la-ltdl.lo: ltdl/$(am__dirstamp) \ - ltdl/$(DEPDIR)/$(am__dirstamp) -ltdl/ltdl_libltdl_la-slist.lo: ltdl/$(am__dirstamp) \ - ltdl/$(DEPDIR)/$(am__dirstamp) +ltdl/libltdl.lo: ltdl/$(am__dirstamp) ltdl/$(DEPDIR)/$(am__dirstamp) ltdl/libltdl.la: $(ltdl_libltdl_la_OBJECTS) $(ltdl_libltdl_la_DEPENDENCIES) ltdl/$(am__dirstamp) - $(AM_V_CCLD)$(ltdl_libltdl_la_LINK) $(am_ltdl_libltdl_la_rpath) $(ltdl_libltdl_la_OBJECTS) $(ltdl_libltdl_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(am_ltdl_libltdl_la_rpath) $(ltdl_libltdl_la_OBJECTS) $(ltdl_libltdl_la_LIBADD) $(LIBS) ltdl/loaders/ltdl_libltdlc_la-preopen.lo: \ ltdl/loaders/$(am__dirstamp) \ ltdl/loaders/$(DEPDIR)/$(am__dirstamp) @@ -6641,6 +6623,8 @@ mostlyclean-compile: -rm -f filters/magick_libMagickCore_la-analyze.lo -rm -f filters/magick_libMagickCore_la-boost.$(OBJEXT) -rm -f filters/magick_libMagickCore_la-boost.lo + -rm -f ltdl/libltdl.$(OBJEXT) + -rm -f ltdl/libltdl.lo -rm -f ltdl/loaders/dld_link.$(OBJEXT) -rm -f ltdl/loaders/dld_link.lo -rm -f ltdl/loaders/dlopen.$(OBJEXT) @@ -6651,22 +6635,10 @@ mostlyclean-compile: -rm -f ltdl/loaders/load_add_on.lo -rm -f ltdl/loaders/loadlibrary.$(OBJEXT) -rm -f ltdl/loaders/loadlibrary.lo - -rm -f ltdl/loaders/ltdl_libltdl_la-preopen.$(OBJEXT) - -rm -f ltdl/loaders/ltdl_libltdl_la-preopen.lo -rm -f ltdl/loaders/ltdl_libltdlc_la-preopen.$(OBJEXT) -rm -f ltdl/loaders/ltdl_libltdlc_la-preopen.lo -rm -f ltdl/loaders/shl_load.$(OBJEXT) -rm -f ltdl/loaders/shl_load.lo - -rm -f ltdl/ltdl_libltdl_la-lt__alloc.$(OBJEXT) - -rm -f ltdl/ltdl_libltdl_la-lt__alloc.lo - -rm -f ltdl/ltdl_libltdl_la-lt_dlloader.$(OBJEXT) - -rm -f ltdl/ltdl_libltdl_la-lt_dlloader.lo - -rm -f ltdl/ltdl_libltdl_la-lt_error.$(OBJEXT) - -rm -f ltdl/ltdl_libltdl_la-lt_error.lo - -rm -f ltdl/ltdl_libltdl_la-ltdl.$(OBJEXT) - -rm -f ltdl/ltdl_libltdl_la-ltdl.lo - -rm -f ltdl/ltdl_libltdl_la-slist.$(OBJEXT) - -rm -f ltdl/ltdl_libltdl_la-slist.lo -rm -f ltdl/ltdl_libltdlc_la-lt__alloc.$(OBJEXT) -rm -f ltdl/ltdl_libltdlc_la-lt__alloc.lo -rm -f ltdl/ltdl_libltdlc_la-lt_dlloader.$(OBJEXT) @@ -7168,11 +7140,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/filters_boost_la-boost.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/magick_libMagickCore_la-analyze.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/magick_libMagickCore_la-boost.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/libltdl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdlc_la-lt__alloc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdlc_la-lt_dlloader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdlc_la-lt_error.Plo@am__quote@ @@ -7183,7 +7151,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/dyld.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/load_add_on.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/loadlibrary.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/shl_load.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-PreRvIcccm.Plo@am__quote@ @@ -8230,54 +8197,6 @@ filters/filters_boost_la-boost.lo: filters/boost.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filters_boost_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filters/filters_boost_la-boost.lo `test -f 'filters/boost.c' || echo '$(srcdir)/'`filters/boost.c -ltdl/loaders/ltdl_libltdl_la-preopen.lo: ltdl/loaders/preopen.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/loaders/ltdl_libltdl_la-preopen.lo -MD -MP -MF ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Tpo -c -o ltdl/loaders/ltdl_libltdl_la-preopen.lo `test -f 'ltdl/loaders/preopen.c' || echo '$(srcdir)/'`ltdl/loaders/preopen.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Tpo ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/loaders/preopen.c' object='ltdl/loaders/ltdl_libltdl_la-preopen.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/loaders/ltdl_libltdl_la-preopen.lo `test -f 'ltdl/loaders/preopen.c' || echo '$(srcdir)/'`ltdl/loaders/preopen.c - -ltdl/ltdl_libltdl_la-lt__alloc.lo: ltdl/lt__alloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-lt__alloc.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Tpo -c -o ltdl/ltdl_libltdl_la-lt__alloc.lo `test -f 'ltdl/lt__alloc.c' || echo '$(srcdir)/'`ltdl/lt__alloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/lt__alloc.c' object='ltdl/ltdl_libltdl_la-lt__alloc.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-lt__alloc.lo `test -f 'ltdl/lt__alloc.c' || echo '$(srcdir)/'`ltdl/lt__alloc.c - -ltdl/ltdl_libltdl_la-lt_dlloader.lo: ltdl/lt_dlloader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-lt_dlloader.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Tpo -c -o ltdl/ltdl_libltdl_la-lt_dlloader.lo `test -f 'ltdl/lt_dlloader.c' || echo '$(srcdir)/'`ltdl/lt_dlloader.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/lt_dlloader.c' object='ltdl/ltdl_libltdl_la-lt_dlloader.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-lt_dlloader.lo `test -f 'ltdl/lt_dlloader.c' || echo '$(srcdir)/'`ltdl/lt_dlloader.c - -ltdl/ltdl_libltdl_la-lt_error.lo: ltdl/lt_error.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-lt_error.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Tpo -c -o ltdl/ltdl_libltdl_la-lt_error.lo `test -f 'ltdl/lt_error.c' || echo '$(srcdir)/'`ltdl/lt_error.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/lt_error.c' object='ltdl/ltdl_libltdl_la-lt_error.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-lt_error.lo `test -f 'ltdl/lt_error.c' || echo '$(srcdir)/'`ltdl/lt_error.c - -ltdl/ltdl_libltdl_la-ltdl.lo: ltdl/ltdl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-ltdl.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Tpo -c -o ltdl/ltdl_libltdl_la-ltdl.lo `test -f 'ltdl/ltdl.c' || echo '$(srcdir)/'`ltdl/ltdl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-ltdl.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/ltdl.c' object='ltdl/ltdl_libltdl_la-ltdl.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-ltdl.lo `test -f 'ltdl/ltdl.c' || echo '$(srcdir)/'`ltdl/ltdl.c - -ltdl/ltdl_libltdl_la-slist.lo: ltdl/slist.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/ltdl_libltdl_la-slist.lo -MD -MP -MF ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Tpo -c -o ltdl/ltdl_libltdl_la-slist.lo `test -f 'ltdl/slist.c' || echo '$(srcdir)/'`ltdl/slist.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Tpo ltdl/$(DEPDIR)/ltdl_libltdl_la-slist.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ltdl/slist.c' object='ltdl/ltdl_libltdl_la-slist.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdl_la-slist.lo `test -f 'ltdl/slist.c' || echo '$(srcdir)/'`ltdl/slist.c - ltdl/loaders/ltdl_libltdlc_la-preopen.lo: ltdl/loaders/preopen.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ltdl/loaders/ltdl_libltdlc_la-preopen.lo -MD -MP -MF ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Tpo -c -o ltdl/loaders/ltdl_libltdlc_la-preopen.lo `test -f 'ltdl/loaders/preopen.c' || echo '$(srcdir)/'`ltdl/loaders/preopen.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Tpo ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Plo diff --git a/coders/emf.c b/coders/emf.c index 3032e000a..6b138f41b 100644 --- a/coders/emf.c +++ b/coders/emf.c @@ -288,8 +288,7 @@ static wchar_t *ConvertUTF8ToUTF16(const unsigned char *source) static HENHMETAFILE ReadEnhMetaFile(const char *path,long *width, long *height) { -#pragma pack( push ) -#pragma pack( 2 ) +#pragma pack( push, 2 ) typedef struct { DWORD dwKey; diff --git a/coders/svg.c b/coders/svg.c index fa4776d2a..a68dec0b7 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -2666,38 +2666,6 @@ static void SVGSetImageSize(int *width,int *height,gpointer context) static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) { - xmlSAXHandler - SAXModules = - { - SVGInternalSubset, - SVGIsStandalone, - SVGHasInternalSubset, - SVGHasExternalSubset, - SVGResolveEntity, - SVGGetEntity, - SVGEntityDeclaration, - SVGNotationDeclaration, - SVGAttributeDeclaration, - SVGElementDeclaration, - SVGUnparsedEntityDeclaration, - SVGSetDocumentLocator, - SVGStartDocument, - SVGEndDocument, - SVGStartElement, - SVGEndElement, - SVGReference, - SVGCharacters, - SVGIgnorableWhitespace, - SVGProcessingInstructions, - SVGComment, - SVGWarning, - SVGError, - SVGError, - SVGGetParameterEntity, - SVGCDataBlock, - SVGExternalSubset - }; - char filename[MaxTextExtent]; @@ -2720,6 +2688,9 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) unsigned char message[MaxTextExtent]; + xmlSAXHandler + SAXModules; + xmlSAXHandlerPtr sax_handler; @@ -2936,6 +2907,34 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"begin SAX"); xmlInitParser(); (void) xmlSubstituteEntitiesDefault(1); + (void) ResetMagickMemory(&SAXModules,0,sizeof(SAXModules)); + SAXModules.internalSubset=SVGInternalSubset; + SAXModules.isStandalone=SVGIsStandalone; + SAXModules.hasInternalSubset=SVGHasInternalSubset; + SAXModules.hasExternalSubset=SVGHasExternalSubset; + SAXModules.resolveEntity=SVGResolveEntity; + SAXModules.getEntity=SVGGetEntity; + SAXModules.entityDecl=SVGEntityDeclaration; + SAXModules.notationDecl=SVGNotationDeclaration; + SAXModules.attributeDecl=SVGAttributeDeclaration; + SAXModules.elementDecl=SVGElementDeclaration; + SAXModules.unparsedEntityDecl=SVGUnparsedEntityDeclaration; + SAXModules.setDocumentLocator=SVGSetDocumentLocator; + SAXModules.startDocument=SVGStartDocument; + SAXModules.endDocument=SVGEndDocument; + SAXModules.startElement=SVGStartElement; + SAXModules.endElement=SVGEndElement; + SAXModules.reference=SVGReference; + SAXModules.characters=SVGCharacters; + SAXModules.ignorableWhitespace=SVGIgnorableWhitespace; + SAXModules.processingInstruction=SVGProcessingInstructions; + SAXModules.comment=SVGComment; + SAXModules.warning=SVGWarning; + SAXModules.error=SVGError; + SAXModules.fatalError=SVGError; + SAXModules.getParameterEntity=SVGGetParameterEntity; + SAXModules.cdataBlock=SVGCDataBlock; + SAXModules.externalSubset=SVGExternalSubset; sax_handler=(&SAXModules); n=ReadBlob(image,MaxTextExtent,message); if (n > 0) diff --git a/config/configure.xml b/config/configure.xml index 234bf7538..9143d29a8 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/config/ltmain.sh b/config/ltmain.sh index 6939dcc4a..a72f2fd78 100644 --- a/config/ltmain.sh +++ b/config/ltmain.sh @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 +# $progname: (GNU libtool) 2.2.6b # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 +VERSION=2.2.6b TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then diff --git a/configure b/configure index 96a9c81f2..88c8a50db 100755 --- a/configure +++ b/configure @@ -8052,8 +8052,8 @@ esac -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' diff --git a/index.html b/index.html index be201fb17..a8c8fd1a5 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +