(no commit message)

diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index c2e437318d34c2e692bf10553c34db2025901755..bf5f7d3610ec30b163d00629b34996155ab116a2 100644 (file)
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/Magick++/lib
 
 if WITH_MAGICK_PLUS_PLUS
 MAGICKPP_LIBS = Magick++/lib/libMagick++.la
+MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/magick/libMagickCore.la
 MAGICKPP_CHECK_PGRMS = $(MAGICKPP_CHECK_PGRMS_OPT)
 MAGICKPP_MANS = $(MAGICKPP_MANS_OPT)
 MAGICKPP_PKGCONFIG = $(MAGICKPP_PKGCONFIG_OPT)
@@ -17,6 +18,7 @@ MAGICKPP_TOP_INCHEADERS = $(MAGICKPP_TOP_INCHEADERS_OPT)
 MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT)
 else
 MAGICKPP_LIBS = 
+MAGICKPP_LDADD =
 MAGICKPP_CHECK_PGRMS = 
 MAGICKPP_MANS = 
 MAGICKPP_PKGCONFIG = 
@@ -154,67 +156,67 @@ MAGICKPP_CHECK_PGRMS_OPT = \
        Magick++/tests/readWriteImages
 
 Magick___demo_analyze_SOURCES          = Magick++/demo/analyze.cpp
-Magick___demo_analyze_LDADD            = $(MAGICKPP_LIBS)
+Magick___demo_analyze_LDADD            = $(MAGICKPP_LDADD)
 
 Magick___demo_button_SOURCES           = Magick++/demo/button.cpp
-Magick___demo_button_LDADD             = $(MAGICKPP_LIBS)
+Magick___demo_button_LDADD             = $(MAGICKPP_LDADD)
 
 Magick___demo_demo_SOURCES             = Magick++/demo/demo.cpp
-Magick___demo_demo_LDADD               = $(MAGICKPP_LIBS)
+Magick___demo_demo_LDADD               = $(MAGICKPP_LDADD)
 
 Magick___demo_detrans_SOURCES          = Magick++/demo/detrans.cpp
-Magick___demo_detrans_LDADD            = $(MAGICKPP_LIBS)
+Magick___demo_detrans_LDADD            = $(MAGICKPP_LDADD)
 
 Magick___demo_flip_SOURCES             = Magick++/demo/flip.cpp
-Magick___demo_flip_LDADD               = $(MAGICKPP_LIBS)
+Magick___demo_flip_LDADD               = $(MAGICKPP_LDADD)
 
 Magick___demo_gravity_SOURCES          = Magick++/demo/gravity.cpp
-Magick___demo_gravity_LDADD            = $(MAGICKPP_LIBS)
+Magick___demo_gravity_LDADD            = $(MAGICKPP_LDADD)
 
 Magick___demo_piddle_SOURCES           = Magick++/demo/piddle.cpp
-Magick___demo_piddle_LDADD             = $(MAGICKPP_LIBS)
+Magick___demo_piddle_LDADD             = $(MAGICKPP_LDADD)
 
 Magick___demo_shapes_SOURCES           = Magick++/demo/shapes.cpp
-Magick___demo_shapes_LDADD             = $(MAGICKPP_LIBS)
+Magick___demo_shapes_LDADD             = $(MAGICKPP_LDADD)
 
 Magick___demo_zoom_SOURCES             = Magick++/demo/zoom.cpp
-Magick___demo_zoom_LDADD               = $(MAGICKPP_LIBS)
+Magick___demo_zoom_LDADD               = $(MAGICKPP_LDADD)
 
 Magick___tests_appendImages_SOURCES    = Magick++/tests/appendImages.cpp
-Magick___tests_appendImages_LDADD      = $(MAGICKPP_LIBS)
+Magick___tests_appendImages_LDADD      = $(MAGICKPP_LDADD)
 
 Magick___tests_attributes_SOURCES      = Magick++/tests/attributes.cpp
-Magick___tests_attributes_LDADD                = $(MAGICKPP_LIBS)
+Magick___tests_attributes_LDADD                = $(MAGICKPP_LDADD)
 
 Magick___tests_averageImages_SOURCES   = Magick++/tests/averageImages.cpp
-Magick___tests_averageImages_LDADD     = $(MAGICKPP_LIBS)
+Magick___tests_averageImages_LDADD     = $(MAGICKPP_LDADD)
 
 Magick___tests_coalesceImages_SOURCES  = Magick++/tests/coalesceImages.cpp
-Magick___tests_coalesceImages_LDADD    = $(MAGICKPP_LIBS)
+Magick___tests_coalesceImages_LDADD    = $(MAGICKPP_LDADD)
 
 Magick___tests_coderInfo_SOURCES       = Magick++/tests/coderInfo.cpp
-Magick___tests_coderInfo_LDADD         = $(MAGICKPP_LIBS)
+Magick___tests_coderInfo_LDADD         = $(MAGICKPP_LDADD)
 
 Magick___tests_color_SOURCES           = Magick++/tests/color.cpp
-Magick___tests_color_LDADD             = $(MAGICKPP_LIBS)
+Magick___tests_color_LDADD             = $(MAGICKPP_LDADD)
 
 Magick___tests_colorHistogram_SOURCES  = Magick++/tests/colorHistogram.cpp
-Magick___tests_colorHistogram_LDADD    = $(MAGICKPP_LIBS)
+Magick___tests_colorHistogram_LDADD    = $(MAGICKPP_LDADD)
 
 Magick___tests_exceptions_SOURCES      = Magick++/tests/exceptions.cpp
-Magick___tests_exceptions_LDADD                = $(MAGICKPP_LIBS)
+Magick___tests_exceptions_LDADD                = $(MAGICKPP_LDADD)
 
 Magick___tests_montageImages_SOURCES   = Magick++/tests/montageImages.cpp
-Magick___tests_montageImages_LDADD     = $(MAGICKPP_LIBS)
+Magick___tests_montageImages_LDADD     = $(MAGICKPP_LDADD)
 
 Magick___tests_morphImages_SOURCES     = Magick++/tests/morphImages.cpp
-Magick___tests_morphImages_LDADD       = $(MAGICKPP_LIBS)
+Magick___tests_morphImages_LDADD       = $(MAGICKPP_LDADD)
 
 Magick___tests_readWriteBlob_SOURCES   = Magick++/tests/readWriteBlob.cpp
-Magick___tests_readWriteBlob_LDADD     = $(MAGICKPP_LIBS)
+Magick___tests_readWriteBlob_LDADD     = $(MAGICKPP_LDADD)
 
 Magick___tests_readWriteImages_SOURCES = Magick++/tests/readWriteImages.cpp
-Magick___tests_readWriteImages_LDADD   = $(MAGICKPP_LIBS)
+Magick___tests_readWriteImages_LDADD   = $(MAGICKPP_LDADD)
 
 
 MAGICKPP_LOCAL_TARGETS = www/Magick++/NEWS.html www/Magick++/ChangeLog.html

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 080d6a790d1e36df0147586c758d187ef98c4240..5d228df8f6862480c507d70e863cadf3f42564ad 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9237M"
+#define MagickSVNRevision  "9237:9242M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/Makefile.in b/Makefile.in
index d4ae797ee38d8443fab4ec10d080db93714063c4..e6f29ff377fa1f8c8d7395ae2b271d5388848eab 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -849,7 +849,7 @@ coders_braille_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_braille_la_LDFLAGS) $(LDFLAGS) \
        -o $@
 @WITH_MODULES_TRUE@am_coders_braille_la_rpath = -rpath $(codersdir)
-coders_cals_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_cals_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
 am_coders_cals_la_OBJECTS = coders/coders_cals_la-cals.lo
 coders_cals_la_OBJECTS = $(am_coders_cals_la_OBJECTS)
 coders_cals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -857,7 +857,8 @@ coders_cals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_cals_la_LDFLAGS) $(LDFLAGS) -o \
        $@
 @WITH_MODULES_TRUE@am_coders_cals_la_rpath = -rpath $(codersdir)
-coders_caption_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_caption_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
+       $(am__DEPENDENCIES_1)
 am_coders_caption_la_OBJECTS = coders/coders_caption_la-caption.lo
 coders_caption_la_OBJECTS = $(am_coders_caption_la_OBJECTS)
 coders_caption_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -913,7 +914,7 @@ coders_cut_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_cut_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_cut_la_rpath = -rpath $(codersdir)
-coders_dcm_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_dcm_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
 am_coders_dcm_la_OBJECTS = coders/coders_dcm_la-dcm.lo
 coders_dcm_la_OBJECTS = $(am_coders_dcm_la_OBJECTS)
 coders_dcm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -944,7 +945,7 @@ coders_dib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 @WITH_MODULES_TRUE@am_coders_dib_la_rpath = -rpath $(codersdir)
 coders_djvu_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_coders_djvu_la_OBJECTS = coders/coders_djvu_la-djvu.lo
 coders_djvu_la_OBJECTS = $(am_coders_djvu_la_OBJECTS)
 coders_djvu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1069,14 +1070,16 @@ coders_hald_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_hald_la_LDFLAGS) $(LDFLAGS) -o \
        $@
 @WITH_MODULES_TRUE@am_coders_hald_la_rpath = -rpath $(codersdir)
-coders_hdr_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
+coders_hdr_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1)
 am_coders_hdr_la_OBJECTS = coders/coders_hdr_la-hdr.lo
 coders_hdr_la_OBJECTS = $(am_coders_hdr_la_OBJECTS)
 coders_hdr_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_hdr_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_hdr_la_rpath = -rpath $(codersdir)
-coders_histogram_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_histogram_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
+       $(am__DEPENDENCIES_1)
 am_coders_histogram_la_OBJECTS =  \
        coders/coders_histogram_la-histogram.lo
 coders_histogram_la_OBJECTS = $(am_coders_histogram_la_OBJECTS)
@@ -1156,7 +1159,8 @@ coders_jp2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(coders_jp2_la_LDFLAGS) $(LDFLAGS) -o $@
 @JP2_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_jp2_la_rpath = -rpath \
 @JP2_DELEGATE_TRUE@@WITH_MODULES_TRUE@ $(codersdir)
-coders_jpeg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
+coders_jpeg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1)
 am_coders_jpeg_la_OBJECTS = coders/coders_jpeg_la-jpeg.lo
 coders_jpeg_la_OBJECTS = $(am_coders_jpeg_la_OBJECTS)
 coders_jpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1165,7 +1169,8 @@ coders_jpeg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $@
 @JPEG_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_jpeg_la_rpath =  \
 @JPEG_DELEGATE_TRUE@@WITH_MODULES_TRUE@        -rpath $(codersdir)
-coders_label_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_label_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
+       $(am__DEPENDENCIES_1)
 am_coders_label_la_OBJECTS = coders/coders_label_la-label.lo
 coders_label_la_OBJECTS = $(am_coders_label_la_OBJECTS)
 coders_label_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1274,7 +1279,7 @@ coders_mtv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_mtv_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_mtv_la_rpath = -rpath $(codersdir)
-coders_mvg_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_mvg_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
 am_coders_mvg_la_OBJECTS = coders/coders_mvg_la-mvg.lo
 coders_mvg_la_OBJECTS = $(am_coders_mvg_la_OBJECTS)
 coders_mvg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1328,7 +1333,7 @@ coders_pcd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_pcd_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_pcd_la_rpath = -rpath $(codersdir)
-coders_pcl_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_pcl_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
 am_coders_pcl_la_OBJECTS = coders/coders_pcl_la-pcl.lo
 coders_pcl_la_OBJECTS = $(am_coders_pcl_la_OBJECTS)
 coders_pcl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1554,7 +1559,8 @@ coders_thumbnail_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 @WITH_MODULES_TRUE@am_coders_thumbnail_la_rpath = -rpath $(codersdir)
 coders_tiff_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1)
 am_coders_tiff_la_OBJECTS = coders/coders_tiff_la-tiff.lo
 coders_tiff_la_OBJECTS = $(am_coders_tiff_la_OBJECTS)
 coders_tiff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1710,7 +1716,7 @@ coders_xpm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(coders_xpm_la_LDFLAGS) $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_coders_xpm_la_rpath = -rpath $(codersdir)
-coders_xps_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+coders_xps_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1)
 am_coders_xps_la_OBJECTS = coders/coders_xps_la-xps.lo
 coders_xps_la_OBJECTS = $(am_coders_xps_la_OBJECTS)
 coders_xps_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -1845,102 +1851,106 @@ am_Magick___demo_analyze_OBJECTS = Magick++/demo/analyze.$(OBJEXT)
 Magick___demo_analyze_OBJECTS = $(am_Magick___demo_analyze_OBJECTS)
 @WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_3 =  \
 @WITH_MAGICK_PLUS_PLUS_TRUE@   Magick++/lib/libMagick++.la
-Magick___demo_analyze_DEPENDENCIES = $(am__DEPENDENCIES_3)
+@WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_4 =  \
+@WITH_MAGICK_PLUS_PLUS_TRUE@   $(am__DEPENDENCIES_3) \
+@WITH_MAGICK_PLUS_PLUS_TRUE@   $(top_builddir)/magick/libMagickCore.la
+Magick___demo_analyze_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_button_OBJECTS = Magick++/demo/button.$(OBJEXT)
 Magick___demo_button_OBJECTS = $(am_Magick___demo_button_OBJECTS)
-Magick___demo_button_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_button_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_demo_OBJECTS = Magick++/demo/demo.$(OBJEXT)
 Magick___demo_demo_OBJECTS = $(am_Magick___demo_demo_OBJECTS)
-Magick___demo_demo_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_demo_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_detrans_OBJECTS = Magick++/demo/detrans.$(OBJEXT)
 Magick___demo_detrans_OBJECTS = $(am_Magick___demo_detrans_OBJECTS)
-Magick___demo_detrans_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_detrans_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_flip_OBJECTS = Magick++/demo/flip.$(OBJEXT)
 Magick___demo_flip_OBJECTS = $(am_Magick___demo_flip_OBJECTS)
-Magick___demo_flip_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_flip_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_gravity_OBJECTS = Magick++/demo/gravity.$(OBJEXT)
 Magick___demo_gravity_OBJECTS = $(am_Magick___demo_gravity_OBJECTS)
-Magick___demo_gravity_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_gravity_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_piddle_OBJECTS = Magick++/demo/piddle.$(OBJEXT)
 Magick___demo_piddle_OBJECTS = $(am_Magick___demo_piddle_OBJECTS)
-Magick___demo_piddle_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_piddle_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_shapes_OBJECTS = Magick++/demo/shapes.$(OBJEXT)
 Magick___demo_shapes_OBJECTS = $(am_Magick___demo_shapes_OBJECTS)
-Magick___demo_shapes_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_shapes_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_zoom_OBJECTS = Magick++/demo/zoom.$(OBJEXT)
 Magick___demo_zoom_OBJECTS = $(am_Magick___demo_zoom_OBJECTS)
-Magick___demo_zoom_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___demo_zoom_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_appendImages_OBJECTS =  \
        Magick++/tests/appendImages.$(OBJEXT)
 Magick___tests_appendImages_OBJECTS =  \
        $(am_Magick___tests_appendImages_OBJECTS)
-Magick___tests_appendImages_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_appendImages_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_attributes_OBJECTS =  \
        Magick++/tests/attributes.$(OBJEXT)
 Magick___tests_attributes_OBJECTS =  \
        $(am_Magick___tests_attributes_OBJECTS)
-Magick___tests_attributes_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_attributes_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_averageImages_OBJECTS =  \
        Magick++/tests/averageImages.$(OBJEXT)
 Magick___tests_averageImages_OBJECTS =  \
        $(am_Magick___tests_averageImages_OBJECTS)
-Magick___tests_averageImages_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_averageImages_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_coalesceImages_OBJECTS =  \
        Magick++/tests/coalesceImages.$(OBJEXT)
 Magick___tests_coalesceImages_OBJECTS =  \
        $(am_Magick___tests_coalesceImages_OBJECTS)
-Magick___tests_coalesceImages_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_coalesceImages_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_coderInfo_OBJECTS =  \
        Magick++/tests/coderInfo.$(OBJEXT)
 Magick___tests_coderInfo_OBJECTS =  \
        $(am_Magick___tests_coderInfo_OBJECTS)
-Magick___tests_coderInfo_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_coderInfo_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_color_OBJECTS = Magick++/tests/color.$(OBJEXT)
 Magick___tests_color_OBJECTS = $(am_Magick___tests_color_OBJECTS)
-Magick___tests_color_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_color_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_colorHistogram_OBJECTS =  \
        Magick++/tests/colorHistogram.$(OBJEXT)
 Magick___tests_colorHistogram_OBJECTS =  \
        $(am_Magick___tests_colorHistogram_OBJECTS)
-Magick___tests_colorHistogram_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_colorHistogram_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_exceptions_OBJECTS =  \
        Magick++/tests/exceptions.$(OBJEXT)
 Magick___tests_exceptions_OBJECTS =  \
        $(am_Magick___tests_exceptions_OBJECTS)
-Magick___tests_exceptions_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_exceptions_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_montageImages_OBJECTS =  \
        Magick++/tests/montageImages.$(OBJEXT)
 Magick___tests_montageImages_OBJECTS =  \
        $(am_Magick___tests_montageImages_OBJECTS)
-Magick___tests_montageImages_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_montageImages_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_morphImages_OBJECTS =  \
        Magick++/tests/morphImages.$(OBJEXT)
 Magick___tests_morphImages_OBJECTS =  \
        $(am_Magick___tests_morphImages_OBJECTS)
-Magick___tests_morphImages_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_morphImages_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_readWriteBlob_OBJECTS =  \
        Magick++/tests/readWriteBlob.$(OBJEXT)
 Magick___tests_readWriteBlob_OBJECTS =  \
        $(am_Magick___tests_readWriteBlob_OBJECTS)
-Magick___tests_readWriteBlob_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_readWriteBlob_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___tests_readWriteImages_OBJECTS =  \
        Magick++/tests/readWriteImages.$(OBJEXT)
 Magick___tests_readWriteImages_OBJECTS =  \
        $(am_Magick___tests_readWriteImages_OBJECTS)
-Magick___tests_readWriteImages_DEPENDENCIES = $(am__DEPENDENCIES_3)
+Magick___tests_readWriteImages_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_tests_drawtest_OBJECTS = tests/drawtest.$(OBJEXT)
 tests_drawtest_OBJECTS = $(am_tests_drawtest_OBJECTS)
-tests_drawtest_DEPENDENCIES = $(MAGICKWAND_LIBS)
+tests_drawtest_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 tests_drawtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(tests_drawtest_LDFLAGS) $(LDFLAGS) -o \
        $@
 am_tests_validate_OBJECTS = tests/tests_validate-validate.$(OBJEXT)
 tests_validate_OBJECTS = $(am_tests_validate_OBJECTS)
-tests_validate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+tests_validate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \
+       $(am__DEPENDENCIES_1)
 am_tests_wandtest_OBJECTS = tests/wandtest.$(OBJEXT)
 tests_wandtest_OBJECTS = $(am_tests_wandtest_OBJECTS)
-tests_wandtest_DEPENDENCIES = $(MAGICKWAND_LIBS)
+tests_wandtest_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 tests_wandtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(tests_wandtest_LDFLAGS) $(LDFLAGS) -o \
@@ -3388,13 +3398,13 @@ coders_braille_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_cals_la_SOURCES = coders/cals.c
 coders_cals_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_cals_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_cals_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_cals_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # CAPTION coder module
 coders_caption_la_SOURCES = coders/caption.c
 coders_caption_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_caption_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_caption_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_caption_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # CINEON coder module
 coders_cin_la_SOURCES = coders/cin.c
@@ -3436,7 +3446,7 @@ coders_cut_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_dcm_la_SOURCES = coders/dcm.c
 coders_dcm_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_dcm_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_dcm_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_dcm_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # DDS coder module
 coders_dds_la_SOURCES = coders/dds.c
@@ -3460,7 +3470,7 @@ coders_dib_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_djvu_la_SOURCES = coders/djvu.c
 coders_djvu_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_djvu_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS)
+coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # DNG coder module
 coders_dng_la_SOURCES = coders/dng.c
@@ -3502,7 +3512,7 @@ coders_ept_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 coders_exr_la_SOURCES = coders/exr.c
 coders_exr_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) $(OPENEXR_CFLAGS)
 coders_exr_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_exr_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS) $(OPENEXR_LIBS)
+coders_exr_la_LIBADD = $(MAGICKCORE_LIBS) $(OPENEXR_LIBS) $(MATH_LIBS)
 
 # FAX coder module
 coders_fax_la_SOURCES = coders/fax.c
@@ -3550,7 +3560,7 @@ coders_gradient_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_histogram_la_SOURCES = coders/histogram.c
 coders_histogram_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_histogram_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_histogram_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_histogram_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # HALD coder module
 coders_hald_la_SOURCES = coders/hald.c
@@ -3562,7 +3572,7 @@ coders_hald_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS)
 coders_hdr_la_SOURCES = coders/hdr.c
 coders_hdr_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_hdr_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_hdr_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS)
+coders_hdr_la_LIBADD = $(MAGICKCORE_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
 
 # HRZ coder module
 coders_hrz_la_SOURCES = coders/hrz.c
@@ -3616,7 +3626,7 @@ coders_jbig_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS)
 coders_jpeg_la_SOURCES = coders/jpeg.c
 coders_jpeg_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_jpeg_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_jpeg_la_LIBADD = $(MAGICKCORE_LIBS) $(JPEG_LIBS)
+coders_jpeg_la_LIBADD = $(MAGICKCORE_LIBS) $(JPEG_LIBS) $(MATH_LIBS)
 
 # JPEG 2000 coder module
 coders_jp2_la_SOURCES = coders/jp2.c
@@ -3627,8 +3637,8 @@ coders_jp2_la_LIBADD = $(MAGICKCORE_LIBS) $(JP2_LIBS) $(JPEG_LIBS) $(MATH_LIBS)
 # LABEL coder module
 coders_label_la_SOURCES = coders/label.c
 coders_label_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
-coders_label_la_LDFLAGS = $(MODULECOMMONFLAGS) $(MATH_LIBS)
-coders_label_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_label_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_label_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # MAC coder module
 coders_mac_la_SOURCES = coders/mac.c
@@ -3712,7 +3722,7 @@ coders_mtv_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_mvg_la_SOURCES = coders/mvg.c
 coders_mvg_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_mvg_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_mvg_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_mvg_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # NULL coder module
 coders_null_la_SOURCES = coders/null.c
@@ -3754,7 +3764,7 @@ coders_pcd_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_pcl_la_SOURCES = coders/pcl.c
 coders_pcl_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_pcl_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_pcl_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_pcl_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # PCX coder module
 coders_pcx_la_SOURCES = coders/pcx.c
@@ -3928,7 +3938,7 @@ coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_tiff_la_SOURCES = coders/tiff.c
 coders_tiff_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_tiff_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS)
+coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # TILE coder module
 coders_tile_la_SOURCES = coders/tile.c
@@ -4048,7 +4058,7 @@ coders_xpm_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_xps_la_SOURCES = coders/xps.c
 coders_xps_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_xps_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_xps_la_LIBADD = $(MAGICKCORE_LIBS)
+coders_xps_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # XWD coder module
 coders_xwd_la_SOURCES = coders/xwd.c
@@ -4633,6 +4643,8 @@ MAGICKWAND_EXTRA_DIST = \
 MAGICKWAND_CLEANFILES = 
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LIBS = 
 @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LIBS = Magick++/lib/libMagick++.la
+@WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LDADD = 
+@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/magick/libMagickCore.la
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_CHECK_PGRMS = 
 @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_CHECK_PGRMS = $(MAGICKPP_CHECK_PGRMS_OPT)
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_MANS = 
@@ -4772,47 +4784,47 @@ MAGICKPP_CHECK_PGRMS_OPT = \
        Magick++/tests/readWriteImages
 
 Magick___demo_analyze_SOURCES = Magick++/demo/analyze.cpp
-Magick___demo_analyze_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_analyze_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_button_SOURCES = Magick++/demo/button.cpp
-Magick___demo_button_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_button_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_demo_SOURCES = Magick++/demo/demo.cpp
-Magick___demo_demo_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_demo_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_detrans_SOURCES = Magick++/demo/detrans.cpp
-Magick___demo_detrans_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_detrans_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_flip_SOURCES = Magick++/demo/flip.cpp
-Magick___demo_flip_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_flip_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_gravity_SOURCES = Magick++/demo/gravity.cpp
-Magick___demo_gravity_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_gravity_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_piddle_SOURCES = Magick++/demo/piddle.cpp
-Magick___demo_piddle_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_piddle_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_shapes_SOURCES = Magick++/demo/shapes.cpp
-Magick___demo_shapes_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_shapes_LDADD = $(MAGICKPP_LDADD)
 Magick___demo_zoom_SOURCES = Magick++/demo/zoom.cpp
-Magick___demo_zoom_LDADD = $(MAGICKPP_LIBS)
+Magick___demo_zoom_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_appendImages_SOURCES = Magick++/tests/appendImages.cpp
-Magick___tests_appendImages_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_appendImages_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_attributes_SOURCES = Magick++/tests/attributes.cpp
-Magick___tests_attributes_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_attributes_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_averageImages_SOURCES = Magick++/tests/averageImages.cpp
-Magick___tests_averageImages_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_averageImages_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_coalesceImages_SOURCES = Magick++/tests/coalesceImages.cpp
-Magick___tests_coalesceImages_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_coalesceImages_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_coderInfo_SOURCES = Magick++/tests/coderInfo.cpp
-Magick___tests_coderInfo_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_coderInfo_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_color_SOURCES = Magick++/tests/color.cpp
-Magick___tests_color_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_color_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_colorHistogram_SOURCES = Magick++/tests/colorHistogram.cpp
-Magick___tests_colorHistogram_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_colorHistogram_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_exceptions_SOURCES = Magick++/tests/exceptions.cpp
-Magick___tests_exceptions_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_exceptions_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_montageImages_SOURCES = Magick++/tests/montageImages.cpp
-Magick___tests_montageImages_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_montageImages_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_morphImages_SOURCES = Magick++/tests/morphImages.cpp
-Magick___tests_morphImages_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_morphImages_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_readWriteBlob_SOURCES = Magick++/tests/readWriteBlob.cpp
-Magick___tests_readWriteBlob_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_readWriteBlob_LDADD = $(MAGICKPP_LDADD)
 Magick___tests_readWriteImages_SOURCES = Magick++/tests/readWriteImages.cpp
-Magick___tests_readWriteImages_LDADD = $(MAGICKPP_LIBS)
+Magick___tests_readWriteImages_LDADD = $(MAGICKPP_LDADD)
 MAGICKPP_LOCAL_TARGETS = www/Magick++/NEWS.html www/Magick++/ChangeLog.html
 
 # Where filter modules get installed
@@ -4927,13 +4939,13 @@ TESTS_CHECK_PGRMS = \
 
 tests_validate_SOURCES = tests/validate.c tests/validate.h
 tests_validate_CPPFLAGS = $(AM_CPPFLAGS)
-tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(MATH_LIBS)
 tests_drawtest_SOURCES = tests/drawtest.c
 tests_drawtest_LDFLAGS = $(LDFLAGS)
-tests_drawtest_LDADD = $(MAGICKWAND_LIBS)
+tests_drawtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 tests_wandtest_SOURCES = tests/wandtest.c
 tests_wandtest_LDFLAGS = $(LDFLAGS)
-tests_wandtest_LDADD = $(MAGICKWAND_LIBS)
+tests_wandtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 TESTS_XFAIL_TESTS = 
 TESTS_TESTS = \
        tests/validate-compare.tap \

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 18f66e2891c3182f062b7c7ed05ce5fe08629681..3bfa904813bb14c81c6c180d4590f6da4ad8f476 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -364,13 +364,13 @@ coders_braille_la_LIBADD   = $(MAGICKCORE_LIBS)
 coders_cals_la_SOURCES    = coders/cals.c
 coders_cals_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_cals_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_cals_la_LIBADD      = $(MAGICKCORE_LIBS)
+coders_cals_la_LIBADD      = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # CAPTION coder module
 coders_caption_la_SOURCES  = coders/caption.c
 coders_caption_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_caption_la_LDFLAGS  = $(MODULECOMMONFLAGS)
-coders_caption_la_LIBADD   = $(MAGICKCORE_LIBS)
+coders_caption_la_LIBADD   = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # CINEON coder module
 coders_cin_la_SOURCES      = coders/cin.c
@@ -412,7 +412,7 @@ coders_cut_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_dcm_la_SOURCES      = coders/dcm.c
 coders_dcm_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_dcm_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_dcm_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_dcm_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # DDS coder module
 coders_dds_la_SOURCES      = coders/dds.c
@@ -436,7 +436,7 @@ coders_dib_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_djvu_la_SOURCES     = coders/djvu.c
 coders_djvu_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_djvu_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_djvu_la_LIBADD      = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS)
+coders_djvu_la_LIBADD      = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # DNG coder module
 coders_dng_la_SOURCES      = coders/dng.c
@@ -478,7 +478,7 @@ coders_ept_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 coders_exr_la_SOURCES      = coders/exr.c
 coders_exr_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS) $(OPENEXR_CFLAGS)
 coders_exr_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_exr_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS) $(OPENEXR_LIBS)
+coders_exr_la_LIBADD       = $(MAGICKCORE_LIBS) $(OPENEXR_LIBS) $(MATH_LIBS)
 
 # FAX coder module
 coders_fax_la_SOURCES      = coders/fax.c
@@ -526,7 +526,7 @@ coders_gradient_la_LIBADD  = $(MAGICKCORE_LIBS)
 coders_histogram_la_SOURCES = coders/histogram.c
 coders_histogram_la_CPPFLAGS= $(MODULE_EXTRA_CPPFLAGS)
 coders_histogram_la_LDFLAGS = $(MODULECOMMONFLAGS)
-coders_histogram_la_LIBADD  = $(MAGICKCORE_LIBS)
+coders_histogram_la_LIBADD  = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # HALD coder module
 coders_hald_la_SOURCES     = coders/hald.c
@@ -538,7 +538,7 @@ coders_hald_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS)
 coders_hdr_la_SOURCES     = coders/hdr.c
 coders_hdr_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_hdr_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_hdr_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS)
+coders_hdr_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
 
 # HRZ coder module
 coders_hrz_la_SOURCES      = coders/hrz.c
@@ -592,8 +592,8 @@ coders_jbig_la_LIBADD      = $(MAGICKCORE_LIBS) $(JBIG_LIBS)
 coders_jpeg_la_SOURCES     = coders/jpeg.c
 coders_jpeg_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_jpeg_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_jpeg_la_LIBADD      = $(MAGICKCORE_LIBS) $(JPEG_LIBS)
-
+coders_jpeg_la_LIBADD      = $(MAGICKCORE_LIBS) $(JPEG_LIBS) $(MATH_LIBS)
+ 
 # JPEG 2000 coder module
 coders_jp2_la_SOURCES      = coders/jp2.c
 coders_jp2_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
@@ -603,8 +603,8 @@ coders_jp2_la_LIBADD       = $(MAGICKCORE_LIBS) $(JP2_LIBS) $(JPEG_LIBS) $(MATH_
 # LABEL coder module
 coders_label_la_SOURCES    = coders/label.c
 coders_label_la_CPPFLAGS   = $(MODULE_EXTRA_CPPFLAGS)
-coders_label_la_LDFLAGS    = $(MODULECOMMONFLAGS) $(MATH_LIBS)
-coders_label_la_LIBADD     = $(MAGICKCORE_LIBS)
+coders_label_la_LDFLAGS    = $(MODULECOMMONFLAGS)
+coders_label_la_LIBADD     = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # MAC coder module
 coders_mac_la_SOURCES      = coders/mac.c
@@ -688,7 +688,7 @@ coders_mtv_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_mvg_la_SOURCES      = coders/mvg.c
 coders_mvg_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_mvg_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_mvg_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_mvg_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # NULL coder module
 coders_null_la_SOURCES     = coders/null.c
@@ -730,7 +730,7 @@ coders_pcd_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_pcl_la_SOURCES      = coders/pcl.c
 coders_pcl_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_pcl_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_pcl_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_pcl_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # PCX coder module
 coders_pcx_la_SOURCES      = coders/pcx.c
@@ -904,7 +904,7 @@ coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS)
 coders_tiff_la_SOURCES     = coders/tiff.c
 coders_tiff_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_tiff_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_tiff_la_LIBADD      = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS)
+coders_tiff_la_LIBADD      = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS)
 
 # TILE coder module
 coders_tile_la_SOURCES     = coders/tile.c
@@ -1024,7 +1024,7 @@ coders_xpm_la_LIBADD       = $(MAGICKCORE_LIBS)
 coders_xps_la_SOURCES      = coders/xps.c
 coders_xps_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
 coders_xps_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_xps_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_xps_la_LIBADD       = $(MAGICKCORE_LIBS) $(MATH_LIBS)
 
 # XWD coder module
 coders_xwd_la_SOURCES      = coders/xwd.c

diff --git a/config/configure.xml b/config/configure.xml
index 4b01d85afff47f6b3d5fe1af7780ac9efbb186ec..67278941779f837accc381f4a159920dbf6e599c 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="9237M" />
+  <configure name="SVN_REVISION" value="9237:9242M" />
   <configure name="RELEASE_DATE" value="2012-09-04"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index e33025a3fd18270373633961e222ad6760637270..28c8ec24b62cceccb892216fffc351efb05b1b1e 100755 (executable)
--- a/configure
+++ b/configure
@@ -3666,7 +3666,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=9237M
+MAGICK_SVN_REVISION=9237:9242M
 
 
 

diff --git a/index.html b/index.html
index a17d8bb4458ee6bfd6714a0f2881b5bf429da902..3aa940ed136f7db87695c1bad9dbcc284e2aabc4 100644 (file)
--- a/index.html
+++ b/index.html
@@ -1,13 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" \r
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
-<html version="-//W3C//DTD XHTML 1.1//EN"\r
-      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\r
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-      xsi:schemaLocation="http://www.w3.org/1999/xhtml\r
-                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">\r
-<head>\r
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>\r
-  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html version="-//W3C//DTD XHTML 1.1//EN"
+      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.w3.org/1999/xhtml
+                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
   <title>ImageMagick: Convert, Edit, Or Compose Bitmap Images</title>
   <meta http-equiv="content-language" content="en-US"/>
   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
@@ -27,64 +27,64 @@
   <meta name="distribution" content="Global"/>
   <link rel="icon" href="wand.png"/>
   <link rel="shortcut icon" href="wand.ico"  type="images/x-icon"/>
-  <link rel="canonical" href="http://www.imagemagick.org" />\r
-  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>\r
-  <!-- Add jQuery library -->\r
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>\r
-  \r
-  <!-- Optionaly include easing and/or mousewheel plugins -->\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>\r
-  \r
-  <!-- Add fancyBox -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>\r
-  \r
-  <!-- Optionaly include button and/or thumbnail helpers -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></script>\r
-  \r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></script>\r
-  <script type="text/javascript">\r
-       $(document).ready(function() {\r
-               $(".fancybox").fancybox();\r
-       });\r
-  </script>\r
-  <!-- ImageMagick style -->\r
-  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />\r
-  <style type="text/css" media="all">\r
-    @import url("http://www.imagemagick.org/www/magick.css");\r
-  </style>\r
-</head>\r
-\r
-<body id="www-imagemagick-org">\r
-<div class="titlebar">\r
-<div style="margin: 17px auto; float: left;">\r
-  <script type="text/javascript">\r
-  <!--\r
-    google_ad_client = "pub-3129977114552745";\r
-    google_ad_slot = "5439289906";\r
-    google_ad_width = 728;\r
-    google_ad_height = 90;\r
-  //-->\r
-  </script>\r
-  <script type="text/javascript"\r
-    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">\r
-  </script>\r
-</div>\r
-<a href="discourse-server">\r
-  <img src="logo.jpg"\r
-  alt="ImageMagick Logo"\r
-  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>\r
-<a href="http://www.imagemagick.org/index.html">\r
-  <img src="sprite.jpg"\r
-  alt="ImageMagick Sprite"\r
-  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>\r
-</div>\r
-\r
-<div class="westbar">\r
-\r
+  <link rel="canonical" href="http://www.imagemagick.org" />
+  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
+  <!-- Add jQuery library -->
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+  
+  <!-- Optionaly include easing and/or mousewheel plugins -->
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>
+  
+  <!-- Add fancyBox -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>
+  
+  <!-- Optionaly include button and/or thumbnail helpers -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></script>
+  
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></script>
+  <script type="text/javascript">
+       $(document).ready(function() {
+               $(".fancybox").fancybox();
+       });
+  </script>
+  <!-- ImageMagick style -->
+  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+  <style type="text/css" media="all">
+    @import url("http://www.imagemagick.org/www/magick.css");
+  </style>
+</head>
+
+<body id="www-imagemagick-org">
+<div class="titlebar">
+<div style="margin: 17px auto; float: left;">
+  <script type="text/javascript">
+  <!--
+    google_ad_client = "pub-3129977114552745";
+    google_ad_slot = "5439289906";
+    google_ad_width = 728;
+    google_ad_height = 90;
+  //-->
+  </script>
+  <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+  </script>
+</div>
+<a href="discourse-server">
+  <img src="logo.jpg"
+  alt="ImageMagick Logo"
+  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
+<a href="http://www.imagemagick.org/index.html">
+  <img src="sprite.jpg"
+  alt="ImageMagick Sprite"
+  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
+</div>
+
+<div class="westbar">
+
 <div class="menu">
   <a title="About ImageMagick" href="http://www.imagemagick.org/index.html">About ImageMagick</a>
 </div>
@@ -103,7 +103,7 @@
 <div class="sub">
     <a title="Binary Release: Windows" href="http://www.imagemagick.org/www/binary-releases.html#windows">Windows</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Command-line Tools" href="http://www.imagemagick.org/www/command-line-tools.html">Command-line Tools</a>
 </div>
@@ -131,7 +131,7 @@
 <div class="sub">
     <a title="Program Interface: Magick++" href="http://www.imagemagick.org/www/magick++.html">Magick++</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div  class="menu">
    <a title="Install from Source" href="http://www.imagemagick.org/www/install-source.html">Install from Source</a>
 </div>
@@ -150,18 +150,18 @@
 <div class="menu">
   <a title="Download" href="http://www.imagemagick.org/www/download.html">Download</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Search" href="http://www.imagemagick.org/www/search.html">Search</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Site Map" href="http://www.imagemagick.org/www/sitemap.html">Site Map</a>
 </div>
 <div  class="sub">
   <a title="Site Map: Links" href="http://www.imagemagick.org/www/links.html">Links</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a rel="follow" title="Sponsors" href="http://www.imagemagick.org/www/sponsors.html">Sponsors:</a>
 
@@ -212,30 +212,30 @@
 </div>
 </div>
 </div>
-</div>\r
-\r
-<div class="eastbar">\r
-  <div class="g-plusone" id="gplusone"></div>\r
-  <script type="text/javascript">\r
-    window.___gcfg = {\r
-      lang: 'en-US'\r
-    };\r
-\r
-    (function() {\r
-      var po = document.createElement('script');\r
-      po.type = 'text/javascript'; po.async = true;\r
-      po.src = 'https://apis.google.com/js/plusone.js';\r
-      var script = document.getElementsByTagName('script')[0];\r
-      script.parentNode.insertBefore(po, script);\r
-    })();\r
-    var gplusone = document.getElementById("gplusone");\r
-    gplusone.setAttribute("data-size","medium");\r
-    gplusone.setAttribute("data-count","false");\r
-  </script>\r
-</div>\r
-\r
-<div class="main">\r
-\r
+</div>
+
+<div class="eastbar">
+  <div class="g-plusone" id="gplusone"></div>
+  <script type="text/javascript">
+    window.___gcfg = {
+      lang: 'en-US'
+    };
+
+    (function() {
+      var po = document.createElement('script');
+      po.type = 'text/javascript'; po.async = true;
+      po.src = 'https://apis.google.com/js/plusone.js';
+      var script = document.getElementsByTagName('script')[0];
+      script.parentNode.insertBefore(po, script);
+    })();
+    var gplusone = document.getElementById("gplusone");
+    gplusone.setAttribute("data-size","medium");
+    gplusone.setAttribute("data-count","false");
+  </script>
+</div>
+
+<div class="main">
+
 <h1>Convert, Edit, and Compose Images</h1>
 <p class="navigation-index">[<a href="index.html#features">Features and Capabilities</a> &bull; <a href="index.html#news">ImageMagick News</a> &bull; <a href="index.html#books">Books About ImageMagick</a> &bull; <a href="index.html#community">User Community</a>]</p>
 
@@ -307,32 +307,32 @@
 <div class="doc-section">
 <p>To join the ImageMagick user community, try the <a href="discourse-server">discourse server</a>.  You can review questions or comments (with informed responses) posed by ImageMagick users or ask your own questions.</p>
 </div>
-\r
-</div>\r
-\r
-<div id="linkbar">\r
-    <span id="linkbar-west">&nbsp;</span>\r
-    <span id="linkbar-center">\r
-      <a href="discourse-server">Discourse Server</a> &bull;\r
-      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>\r
-    </span>\r
-    <span id="linkbar-east">&nbsp;</span>\r
-  </div>\r
-  <div class="footer">\r
-    <span id="footer-west">&copy; 1999-2012 ImageMagick Studio LLC</span>\r
-    <span id="footer-east"> <a href="http://www.imagemagick.org/www/contact.html">Contact the Wizards</a></span>\r
-  </div>\r
-  <div style="clear: both; margin: 0; width: 100%; "></div>\r
-  <script type="text/javascript">\r
-    var _gaq = _gaq || [];\r
-    _gaq.push(['_setAccount', 'UA-17690367-1']);\r
-    _gaq.push(['_trackPageview']);\r
-\r
-    (function() {\r
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\r
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\r
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\r
-    })();\r
-  </script>\r
-</body>\r
-</html>\r
+
+</div>
+
+<div id="linkbar">
+    <span id="linkbar-west">&nbsp;</span>
+    <span id="linkbar-center">
+      <a href="discourse-server">Discourse Server</a> &bull;
+      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>
+    </span>
+    <span id="linkbar-east">&nbsp;</span>
+  </div>
+  <div class="footer">
+    <span id="footer-west">&copy; 1999-2012 ImageMagick Studio LLC</span>
+    <span id="footer-east"> <a href="http://www.imagemagick.org/www/contact.html">Contact the Wizards</a></span>
+  </div>
+  <div style="clear: both; margin: 0; width: 100%; "></div>
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-17690367-1']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</body>
+</html>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4e5da686f7eaae126d53097e6c28d4212b38b76b..670e7613a36d968bd3b99c03a4e9260243dbf77b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,15 +21,15 @@ TESTS_CHECK_PGRMS = \
 
 tests_validate_SOURCES = tests/validate.c tests/validate.h
 tests_validate_CPPFLAGS = $(AM_CPPFLAGS)
-tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(MATH_LIBS)
 
 tests_drawtest_SOURCES = tests/drawtest.c
 tests_drawtest_LDFLAGS = $(LDFLAGS)
-tests_drawtest_LDADD = $(MAGICKWAND_LIBS)
+tests_drawtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 
 tests_wandtest_SOURCES = tests/wandtest.c
 tests_wandtest_LDFLAGS = $(LDFLAGS)
-tests_wandtest_LDADD = $(MAGICKWAND_LIBS)
+tests_wandtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 
 TESTS_XFAIL_TESTS = 
 

diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
index 164e6c98e4ace69f0e4ed9aa34cbcd47da3ae6e7..51ca2eb3ac57cff42afe6a816bcfaf6c3636ded2 100644 (file)
--- a/www/advanced-unix-installation.html
+++ b/www/advanced-unix-installation.html
@@ -1,13 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" \r
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
-<html version="-//W3C//DTD XHTML 1.1//EN"\r
-      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\r
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-      xsi:schemaLocation="http://www.w3.org/1999/xhtml\r
-                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">\r
-<head>\r
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>\r
-  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html version="-//W3C//DTD XHTML 1.1//EN"
+      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.w3.org/1999/xhtml
+                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
   <title>ImageMagick: Advanced Unix Source Installation</title>
   <meta http-equiv="content-language" content="en-US"/>
   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
@@ -27,64 +27,64 @@
   <meta name="distribution" content="Global"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"  type="images/x-icon"/>
-  <link rel="canonical" href="http://www.imagemagick.org" />\r
-  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>\r
-  <!-- Add jQuery library -->\r
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>\r
-  \r
-  <!-- Optionaly include easing and/or mousewheel plugins -->\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>\r
-  \r
-  <!-- Add fancyBox -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>\r
-  \r
-  <!-- Optionaly include button and/or thumbnail helpers -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></script>\r
-  \r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></script>\r
-  <script type="text/javascript">\r
-       $(document).ready(function() {\r
-               $(".fancybox").fancybox();\r
-       });\r
-  </script>\r
-  <!-- ImageMagick style -->\r
-  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />\r
-  <style type="text/css" media="all">\r
-    @import url("../www/magick.css");\r
-  </style>\r
-</head>\r
-\r
-<body id="www-imagemagick-org">\r
-<div class="titlebar">\r
-<div style="margin: 17px auto; float: left;">\r
-  <script type="text/javascript">\r
-  <!--\r
-    google_ad_client = "pub-3129977114552745";\r
-    google_ad_slot = "5439289906";\r
-    google_ad_width = 728;\r
-    google_ad_height = 90;\r
-  //-->\r
-  </script>\r
-  <script type="text/javascript"\r
-    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">\r
-  </script>\r
-</div>\r
-<a href="../discourse-server">\r
-  <img src="../images/logo.jpg"\r
-  alt="ImageMagick Logo"\r
-  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>\r
-<a href="../index.html">\r
-  <img src="../images/sprite.jpg"\r
-  alt="ImageMagick Sprite"\r
-  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>\r
-</div>\r
-\r
-<div class="westbar">\r
-\r
+  <link rel="canonical" href="http://www.imagemagick.org" />
+  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
+  <!-- Add jQuery library -->
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+  
+  <!-- Optionaly include easing and/or mousewheel plugins -->
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>
+  
+  <!-- Add fancyBox -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>
+  
+  <!-- Optionaly include button and/or thumbnail helpers -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></script>
+  
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></script>
+  <script type="text/javascript">
+       $(document).ready(function() {
+               $(".fancybox").fancybox();
+       });
+  </script>
+  <!-- ImageMagick style -->
+  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+  <style type="text/css" media="all">
+    @import url("../www/magick.css");
+  </style>
+</head>
+
+<body id="www-imagemagick-org">
+<div class="titlebar">
+<div style="margin: 17px auto; float: left;">
+  <script type="text/javascript">
+  <!--
+    google_ad_client = "pub-3129977114552745";
+    google_ad_slot = "5439289906";
+    google_ad_width = 728;
+    google_ad_height = 90;
+  //-->
+  </script>
+  <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+  </script>
+</div>
+<a href="../discourse-server">
+  <img src="../images/logo.jpg"
+  alt="ImageMagick Logo"
+  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
+<a href="../index.html">
+  <img src="../images/sprite.jpg"
+  alt="ImageMagick Sprite"
+  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
+</div>
+
+<div class="westbar">
+
 <div class="menu">
   <a title="About ImageMagick" href="../index.html">About ImageMagick</a>
 </div>
@@ -103,7 +103,7 @@
 <div class="sub">
     <a title="Binary Release: Windows" href="binary-releases.html#windows">Windows</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Command-line Tools" href="command-line-tools.html">Command-line Tools</a>
 </div>
@@ -131,7 +131,7 @@
 <div class="sub">
     <a title="Program Interface: Magick++" href="magick++.html">Magick++</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div  class="menu">
    <a title="Install from Source" href="install-source.html">Install from Source</a>
 </div>
@@ -150,18 +150,18 @@
 <div class="menu">
   <a title="Download" href="download.html">Download</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Search" href="search.html">Search</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Site Map" href="sitemap.html">Site Map</a>
 </div>
 <div  class="sub">
   <a title="Site Map: Links" href="links.html">Links</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a rel="follow" title="Sponsors" href="sponsors.html">Sponsors:</a>
 
@@ -212,31 +212,31 @@
 </div>
 </div>
 </div>
-</div>\r
-\r
-<div class="eastbar">\r
-  <div class="g-plusone" id="gplusone"></div>\r
-  <script type="text/javascript">\r
-    window.___gcfg = {\r
-      lang: 'en-US'\r
-    };\r
-\r
-    (function() {\r
-      var po = document.createElement('script');\r
-      po.type = 'text/javascript'; po.async = true;\r
-      po.src = 'https://apis.google.com/js/plusone.js';\r
-      var script = document.getElementsByTagName('script')[0];\r
-      script.parentNode.insertBefore(po, script);\r
-    })();\r
-    var gplusone = document.getElementById("gplusone");\r
-    gplusone.setAttribute("data-size","medium");\r
-    gplusone.setAttribute("data-count","false");\r
-  </script>\r
-</div>\r
-\r
-<div class="main">\r
-\r
-\r
+</div>
+
+<div class="eastbar">
+  <div class="g-plusone" id="gplusone"></div>
+  <script type="text/javascript">
+    window.___gcfg = {
+      lang: 'en-US'
+    };
+
+    (function() {
+      var po = document.createElement('script');
+      po.type = 'text/javascript'; po.async = true;
+      po.src = 'https://apis.google.com/js/plusone.js';
+      var script = document.getElementsByTagName('script')[0];
+      script.parentNode.insertBefore(po, script);
+    })();
+    var gplusone = document.getElementById("gplusone");
+    gplusone.setAttribute("data-size","medium");
+    gplusone.setAttribute("data-count","false");
+  </script>
+</div>
+
+<div class="main">
+
+
 <h1>ImageMagick Advanced Unix Installation</h1>
 <p class="navigation-index">[<a href="advanced-unix-installation.html#download">Download &amp; Unpack</a> &bull; <a href="advanced-unix-installation.html#configure">Configure</a>  &bull; <a href="advanced-unix-installation.html#build">Build</a> &bull; <a href="advanced-unix-installation.html#install">Install</a> &bull; <a href="advanced-unix-installation.html#linux">Linux-specific Build Instructions</a> &bull; <a href="advanced-unix-installation.html#macosx">Mac OS X-specific Build Instructions</a> &bull; <a href="advanced-unix-installation.html#mingw">MinGW-specific Build Instructions</a> &bull; <a href="advanced-unix-installation.html#problems">Dealing with Unexpected Problems</a>]</p>
 
@@ -671,32 +671,32 @@ Options used to compile and link:
 <p>If PerlMagick fails to link with a message similar to <em>libperl.a is not found</em>, rerun <kbd>configure</kbd> with the <kbd>--enable-shared</kbd> or <kbd>--enable-shared --with-modules</kbd> options.</p>
 
 </div>
-\r
-</div>\r
-\r
-<div id="linkbar">\r
-    <span id="linkbar-west">&nbsp;</span>\r
-    <span id="linkbar-center">\r
-      <a href="../discourse-server">Discourse Server</a> &bull;\r
-      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>\r
-    </span>\r
-    <span id="linkbar-east">&nbsp;</span>\r
-  </div>\r
-  <div class="footer">\r
-    <span id="footer-west">&copy; 1999-2012 ImageMagick Studio LLC</span>\r
-    <span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>\r
-  </div>\r
-  <div style="clear: both; margin: 0; width: 100%; "></div>\r
-  <script type="text/javascript">\r
-    var _gaq = _gaq || [];\r
-    _gaq.push(['_setAccount', 'UA-17690367-1']);\r
-    _gaq.push(['_trackPageview']);\r
-\r
-    (function() {\r
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\r
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\r
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\r
-    })();\r
-  </script>\r
-</body>\r
-</html>\r
+
+</div>
+
+<div id="linkbar">
+    <span id="linkbar-west">&nbsp;</span>
+    <span id="linkbar-center">
+      <a href="../discourse-server">Discourse Server</a> &bull;
+      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>
+    </span>
+    <span id="linkbar-east">&nbsp;</span>
+  </div>
+  <div class="footer">
+    <span id="footer-west">&copy; 1999-2012 ImageMagick Studio LLC</span>
+    <span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>
+  </div>
+  <div style="clear: both; margin: 0; width: 100%; "></div>
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-17690367-1']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</body>
+</html>

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
index 455313ceb9c042321681779e10ec8ea08c9fa148..340e24bafffb1be32f92f16ffd840b1214e7e5eb 100644 (file)
--- a/www/advanced-windows-installation.html
+++ b/www/advanced-windows-installation.html
@@ -1,13 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" \r
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
-<html version="-//W3C//DTD XHTML 1.1//EN"\r
-      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\r
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-      xsi:schemaLocation="http://www.w3.org/1999/xhtml\r
-                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">\r
-<head>\r
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>\r
-  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html version="-//W3C//DTD XHTML 1.1//EN"
+      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.w3.org/1999/xhtml
+                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
   <title>ImageMagick: Advanced Windows Source Installation</title>
   <meta http-equiv="Content-Language" content="en-US"/>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -27,64 +27,64 @@
   <meta name="Distribution" content="Global"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"  type="images/x-icon"/>
-  <link rel="canonical" href="http://www.imagemagick.org" />\r
-  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>\r
-  <!-- Add jQuery library -->\r
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>\r
-  \r
-  <!-- Optionaly include easing and/or mousewheel plugins -->\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>\r
-  \r
-  <!-- Add fancyBox -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.3" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.3"></script>\r
-  \r
-  <!-- Optionaly include button and/or thumbnail helpers -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.3" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.3"></script>\r
-  \r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.3" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.3"></script>\r
-  <script type="text/javascript">\r
-       $(document).ready(function() {\r
-               $(".fancybox").fancybox();\r
-       });\r
-  </script>\r
-  <!-- ImageMagick style -->\r
-  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />\r
-  <style type="text/css" media="all">\r
-    @import url("../www/magick.css");\r
-  </style>\r
-</head>\r
-\r
-<body id="www-imagemagick-org">\r
-<div class="titlebar">\r
-<div style="margin: 17px auto; float: left;">\r
-  <script type="text/javascript">\r
-  <!--\r
-    google_ad_client = "pub-3129977114552745";\r
-    google_ad_slot = "5439289906";\r
-    google_ad_width = 728;\r
-    google_ad_height = 90;\r
-  //-->\r
-  </script>\r
-  <script type="text/javascript"\r
-    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">\r
-  </script>\r
-</div>\r
-<a href="http://www.imagemagick.org/discourse-server/">\r
-  <img src="../images/logo.jpg"\r
-  alt="ImageMagick Logo"\r
-  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>\r
-<a href="../index.html">\r
-  <img src="../images/sprite.jpg"\r
-  alt="ImageMagick Sprite"\r
-  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>\r
-</div>\r
-\r
-<div class="westbar">\r
-\r
+  <link rel="canonical" href="http://www.imagemagick.org" />
+  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
+  <!-- Add jQuery library -->
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+  
+  <!-- Optionaly include easing and/or mousewheel plugins -->
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>
+  
+  <!-- Add fancyBox -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.3" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.3"></script>
+  
+  <!-- Optionaly include button and/or thumbnail helpers -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.3" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.3"></script>
+  
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.3" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.3"></script>
+  <script type="text/javascript">
+       $(document).ready(function() {
+               $(".fancybox").fancybox();
+       });
+  </script>
+  <!-- ImageMagick style -->
+  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+  <style type="text/css" media="all">
+    @import url("../www/magick.css");
+  </style>
+</head>
+
+<body id="www-imagemagick-org">
+<div class="titlebar">
+<div style="margin: 17px auto; float: left;">
+  <script type="text/javascript">
+  <!--
+    google_ad_client = "pub-3129977114552745";
+    google_ad_slot = "5439289906";
+    google_ad_width = 728;
+    google_ad_height = 90;
+  //-->
+  </script>
+  <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+  </script>
+</div>
+<a href="http://www.imagemagick.org/discourse-server/">
+  <img src="../images/logo.jpg"
+  alt="ImageMagick Logo"
+  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
+<a href="../index.html">
+  <img src="../images/sprite.jpg"
+  alt="ImageMagick Sprite"
+  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
+</div>
+
+<div class="westbar">
+
 <div class="menu">
   <a title="About ImageMagick" href="../index.html">About ImageMagick</a>
 </div>
@@ -103,7 +103,7 @@
 <div class="sub">
     <a title="Binary Release: Windows" href="../www/binary-releases.html#windows">Windows</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Command-line Tools" href="../www/command-line-tools.html">Command-line Tools</a>
 </div>
@@ -131,7 +131,7 @@
 <div class="sub">
     <a title="Program Interface: Magick++" href="../www/magick++.html">Magick++</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div  class="menu">
    <a title="Install from Source" href="../www/install-source.html">Install from Source</a>
 </div>
@@ -150,18 +150,18 @@
 <div class="menu">
   <a title="Download" href="../www/download.html">Download</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Search" href="../www/search.html">Search</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Site Map" href="../www/sitemap.html">Site Map</a>
 </div>
 <div  class="sub">
   <a title="Site Map: Links" href="../www/links.html">Links</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a rel="follow" title="Sponsors" href="../www/sponsors.html">Sponsors:</a>
 
@@ -221,26 +221,26 @@
 </div>
 </div>
 </div>
-</div>\r
-\r
-<div class="eastbar">\r
-  <div class="g-plusone" data-size="standard" data-count="false"></div>\r
-  <script type="text/javascript">\r
-    window.___gcfg = {\r
-      lang: 'en-US'\r
-    };\r
-\r
-    (function() {\r
-      var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;\r
-      po.src = 'https://apis.google.com/js/plusone.js';\r
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);\r
-    })();\r
-  </script>\r
-</div>\r
-\r
-<div class="main">\r
-\r
-\r
+</div>
+
+<div class="eastbar">
+  <div class="g-plusone" data-size="standard" data-count="false"></div>
+  <script type="text/javascript">
+    window.___gcfg = {
+      lang: 'en-US'
+    };
+
+    (function() {
+      var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+      po.src = 'https://apis.google.com/js/plusone.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+    })();
+  </script>
+</div>
+
+<div class="main">
+
+
 <h1>ImageMagick Advanced Windows Installation</h1>
 <p class="navigation-index">[<a href="#download">Download &amp; Unpack</a> &bull; <a href="#configure">Configure</a>  &bull; <a href="#build">Build</a> &bull; <a href="#install">Install</a> &bull; <a href="#binary">Create a Self-installing Binary Distribution</a> &bull; <a href="#problems">Dealing with Unexpected Problems</a> &bull; <a href="#project">Building Your Custom Project</a>]</p>
 
@@ -565,32 +565,32 @@
 </pre>
 
 </div>
-\r
-</div>\r
-\r
-<div id="linkbar">\r
-    <span id="linkbar-west">&nbsp;</span>\r
-    <span id="linkbar-center">\r
-      <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> &bull;\r
-      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>\r
-    </span>\r
-    <span id="linkbar-east">&nbsp;</span>\r
-  </div>\r
-  <div class="footer">\r
-    <span id="footer-west">&copy; 1999-2011 ImageMagick Studio LLC</span>\r
-    <span id="footer-east"> <a href="http://www.imagemagick.org/script/contact.php">Contact the Wizards</a></span>\r
-  </div>\r
-  <div style="clear: both; margin: 0; width: 100%; "></div>\r
-  <script type="text/javascript">\r
-    var _gaq = _gaq || [];\r
-    _gaq.push(['_setAccount', 'UA-17690367-1']);\r
-    _gaq.push(['_trackPageview']);\r
-\r
-    (function() {\r
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\r
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\r
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\r
-    })();\r
-  </script>\r
-</body>\r
-</html>\r
+
+</div>
+
+<div id="linkbar">
+    <span id="linkbar-west">&nbsp;</span>
+    <span id="linkbar-center">
+      <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> &bull;
+      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>
+    </span>
+    <span id="linkbar-east">&nbsp;</span>
+  </div>
+  <div class="footer">
+    <span id="footer-west">&copy; 1999-2011 ImageMagick Studio LLC</span>
+    <span id="footer-east"> <a href="http://www.imagemagick.org/script/contact.php">Contact the Wizards</a></span>
+  </div>
+  <div style="clear: both; margin: 0; width: 100%; "></div>
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-17690367-1']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</body>
+</html>

diff --git a/www/animate.html b/www/animate.html
index 461a8710c6afcb870634f5473b2a4fc5e4f1e142..06a03e71dcbe975adf2d2a3cf3fafcb53e00c548 100644 (file)
--- a/www/animate.html
+++ b/www/animate.html
@@ -1,14 +1,14 @@
-\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" \r
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
-<html version="-//W3C//DTD XHTML 1.1//EN"\r
-      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\r
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-      xsi:schemaLocation="http://www.w3.org/1999/xhtml\r
-                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">\r
-<head>\r
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>\r
-  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>\r
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html version="-//W3C//DTD XHTML 1.1//EN"
+      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.w3.org/1999/xhtml
+                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>
   <title>ImageMagick: Command-line Tools: Animate</title>
   <meta http-equiv="content-language" content="en-US"/>
   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
@@ -28,64 +28,64 @@
   <meta name="distribution" content="Global"/>
   <link rel="icon" href="../images/wand.png"/>
   <link rel="shortcut icon" href="../images/wand.ico"  type="images/x-icon"/>
-  <link rel="canonical" href="http://www.imagemagick.org" />\r
-  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>\r
-  <!-- Add jQuery library -->\r
-  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>\r
-  \r
-  <!-- Optionaly include easing and/or mousewheel plugins -->\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>\r
-  \r
-  <!-- Add fancyBox -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>\r
-  \r
-  <!-- Optionaly include button and/or thumbnail helpers -->\r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></script>\r
-  \r
-  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />\r
-  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></script>\r
-  <script type="text/javascript">\r
-       $(document).ready(function() {\r
-               $(".fancybox").fancybox();\r
-       });\r
-  </script>\r
-  <!-- ImageMagick style -->\r
-  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />\r
-  <style type="text/css" media="all">\r
-    @import url("../www/magick.css");\r
-  </style>\r
-</head>\r
-\r
-<body id="www-imagemagick-org">\r
-<div class="titlebar">\r
-<div style="margin: 17px auto; float: left;">\r
-  <script type="text/javascript">\r
-  <!--\r
-    google_ad_client = "pub-3129977114552745";\r
-    google_ad_slot = "5439289906";\r
-    google_ad_width = 728;\r
-    google_ad_height = 90;\r
-  //-->\r
-  </script>\r
-  <script type="text/javascript"\r
-    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">\r
-  </script>\r
-</div>\r
-<a href="../discourse-server">\r
-  <img src="../images/logo.jpg"\r
-  alt="ImageMagick Logo"\r
-  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>\r
-<a href="../index.html">\r
-  <img src="../images/sprite.jpg"\r
-  alt="ImageMagick Sprite"\r
-  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>\r
-</div>\r
-\r
-<div class="westbar">\r
-\r
+  <link rel="canonical" href="http://www.imagemagick.org" />
+  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>
+  <!-- Add jQuery library -->
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
+  
+  <!-- Optionaly include easing and/or mousewheel plugins -->
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>
+  
+  <!-- Add fancyBox -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.4"></script>
+  
+  <!-- Optionaly include button and/or thumbnail helpers -->
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.4"></script>
+  
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.4" type="text/css" media="screen" />
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.4"></script>
+  <script type="text/javascript">
+       $(document).ready(function() {
+               $(".fancybox").fancybox();
+       });
+  </script>
+  <!-- ImageMagick style -->
+  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />
+  <style type="text/css" media="all">
+    @import url("../www/magick.css");
+  </style>
+</head>
+
+<body id="www-imagemagick-org">
+<div class="titlebar">
+<div style="margin: 17px auto; float: left;">
+  <script type="text/javascript">
+  <!--
+    google_ad_client = "pub-3129977114552745";
+    google_ad_slot = "5439289906";
+    google_ad_width = 728;
+    google_ad_height = 90;
+  //-->
+  </script>
+  <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+  </script>
+</div>
+<a href="../discourse-server">
+  <img src="../images/logo.jpg"
+  alt="ImageMagick Logo"
+  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>
+<a href="../index.html">
+  <img src="../images/sprite.jpg"
+  alt="ImageMagick Sprite"
+  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>
+</div>
+
+<div class="westbar">
+
 <div class="menu">
   <a title="About ImageMagick" href="../index.html">About ImageMagick</a>
 </div>
@@ -104,7 +104,7 @@
 <div class="sub">
     <a title="Binary Release: Windows" href="binary-releases.html#windows">Windows</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Command-line Tools" href="command-line-tools.html">Command-line Tools</a>
 </div>
@@ -132,7 +132,7 @@
 <div class="sub">
     <a title="Program Interface: Magick++" href="magick++.html">Magick++</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div  class="menu">
    <a title="Install from Source" href="install-source.html">Install from Source</a>
 </div>
@@ -151,18 +151,18 @@
 <div class="menu">
   <a title="Download" href="download.html">Download</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Search" href="search.html">Search</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a title="Site Map" href="sitemap.html">Site Map</a>
 </div>
 <div  class="sub">
   <a title="Site Map: Links" href="links.html">Links</a>
 </div>
-<div class="sep"></div>\r
+<div class="sep"></div>
 <div class="menu">
   <a rel="follow" title="Sponsors" href="sponsors.html">Sponsors:</a>
 
@@ -213,30 +213,30 @@
 </div>
 </div>
 </div>
-</div>\r
-\r
-<div class="eastbar">\r
-  <div class="g-plusone" id="gplusone"></div>\r
-  <script type="text/javascript">\r
-    window.___gcfg = {\r
-      lang: 'en-US'\r
-    };\r
-\r
-    (function() {\r
-      var po = document.createElement('script');\r
-      po.type = 'text/javascript'; po.async = true;\r
-      po.src = 'https://apis.google.com/js/plusone.js';\r
-      var script = document.getElementsByTagName('script')[0];\r
-      script.parentNode.insertBefore(po, script);\r
-    })();\r
-    var gplusone = document.getElementById("gplusone");\r
-    gplusone.setAttribute("data-size","medium");\r
-    gplusone.setAttribute("data-count","false");\r
-  </script>\r
-</div>\r
-\r
-<div class="main">\r
-\r
+</div>
+
+<div class="eastbar">
+  <div class="g-plusone" id="gplusone"></div>
+  <script type="text/javascript">
+    window.___gcfg = {
+      lang: 'en-US'
+    };
+
+    (function() {
+      var po = document.createElement('script');
+      po.type = 'text/javascript'; po.async = true;
+      po.src = 'https://apis.google.com/js/plusone.js';
+      var script = document.getElementsByTagName('script')[0];
+      script.parentNode.insertBefore(po, script);
+    })();
+    var gplusone = document.getElementById("gplusone");
+    gplusone.setAttribute("data-size","medium");
+    gplusone.setAttribute("data-count","false");
+  </script>
+</div>
+
+<div class="main">
+
 <h1>ImageMagick Animate Command-line Tool</h1>
 <p class="navigation-index">[<a href="animate.html#usage">Example Usage</a> &bull; <a href="animate.html#options">Option Summary</a>]</p>
 
@@ -693,32 +693,32 @@ transparent, extract, background, or shape the alpha channel</td>
   </tbody>
 </table>
 </div>
-\r
-</div>\r
-\r
-<div id="linkbar">\r
-    <span id="linkbar-west">&nbsp;</span>\r
-    <span id="linkbar-center">\r
-      <a href="../discourse-server">Discourse Server</a> &bull;\r
-      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>\r
-    </span>\r
-    <span id="linkbar-east">&nbsp;</span>\r
-  </div>\r
-  <div class="footer">\r
-    <span id="footer-west">&copy; 1999-2012 ImageMagick Studio LLC</span>\r
-    <span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>\r
-  </div>\r
-  <div style="clear: both; margin: 0; width: 100%; "></div>\r
-  <script type="text/javascript">\r
-    var _gaq = _gaq || [];\r
-    _gaq.push(['_setAccount', 'UA-17690367-1']);\r
-    _gaq.push(['_trackPageview']);\r
-\r
-    (function() {\r
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\r
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\r
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\r
-    })();\r
-  </script>\r
-</body>\r
-</html>\r
+
+</div>
+
+<div id="linkbar">
+    <span id="linkbar-west">&nbsp;</span>
+    <span id="linkbar-center">
+      <a href="../discourse-server">Discourse Server</a> &bull;
+      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>
+    </span>
+    <span id="linkbar-east">&nbsp;</span>
+  </div>
+  <div class="footer">
+    <span id="footer-west">&copy; 1999-2012 ImageMagick Studio LLC</span>
+    <span id="footer-east"> <a href="contact.html">Contact the Wizards</a></span>
+  </div>
+  <div style="clear: both; margin: 0; width: 100%; "></div>
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-17690367-1']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</body>
+</html>