(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index cc7a5e5cbb35be8fd816332ead61dbeb4aa10cdb..978a4cd7ad566286ab755ad5f08df59ff9bc6c7c 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES
-#define MAGICKCORE_BUILD_MODULES 1
-#endif
+/* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -77,9 +75,7 @@
 #endif
 
 /* Define if you have FFTW library */
-#ifndef MAGICKCORE_FFTW_DELEGATE
-#define MAGICKCORE_FFTW_DELEGATE 1
-#endif
+/* #undef FFTW_DELEGATE */
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
@@ -221,9 +217,7 @@
 #endif
 
 /* Define to 1 if you have the <CL/cl.h> header file. */
-#ifndef MAGICKCORE_HAVE_CL_CL_H
-#define MAGICKCORE_HAVE_CL_CL_H 1
-#endif
+/* #undef HAVE_CL_CL_H */
 
 /* Define to 1 if you have the <complex.h> header file. */
 #ifndef MAGICKCORE_HAVE_COMPLEX_H
@@ -1177,9 +1171,7 @@
 #endif
 
 /* Define if you have JBIG library */
-#ifndef MAGICKCORE_JBIG_DELEGATE
-#define MAGICKCORE_JBIG_DELEGATE 1
-#endif
+/* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1220,7 +1212,7 @@
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/octave/3.4.2:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1271,9 +1263,7 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-#ifndef MAGICKCORE_OPENEXR_DELEGATE
-#define MAGICKCORE_OPENEXR_DELEGATE 1
-#endif
+/* #undef OPENEXR_DELEGATE */
 
 /* Name of package */
 #ifndef MAGICKCORE_PACKAGE
@@ -1333,9 +1323,7 @@
 #endif
 
 /* Define if you have RSVG library */
-#ifndef MAGICKCORE_RSVG_DELEGATE
-#define MAGICKCORE_RSVG_DELEGATE 1
-#endif
+/* #undef RSVG_DELEGATE */
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1491,9 +1479,7 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-#ifndef MAGICKCORE_WMF_DELEGATE
-#define MAGICKCORE_WMF_DELEGATE 1
-#endif
+/* #undef WMF_DELEGATE */
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -1549,9 +1535,7 @@
 /* #undef _MINIX */
 
 /* Define this for the OpenCL Accelerator */
-#ifndef MAGICKCORE__OPENCL
-#define MAGICKCORE__OPENCL 1
-#endif
+/* #undef _OPENCL */
 
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */

diff --git a/MagickCore/static.c b/MagickCore/static.c
index 9ef564c851d927477f6506e35a14e574b0f387a5..b0f311d3d35cd6a3970675449c493fc33b637ac7 100644 (file)
--- a/MagickCore/static.c
+++ b/MagickCore/static.c
@@ -247,6 +247,9 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterNULLImage();
   (void) RegisterOTBImage();
   (void) RegisterPALMImage();
+#if defined(MAGICKCORE_PANGO_DELEGATE)
+  (void) RegisterPANGOImage();
+#endif
   (void) RegisterPATTERNImage();
   (void) RegisterPCDImage();
   (void) RegisterPCLImage();
@@ -422,6 +425,9 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterNULLImage();
   UnregisterOTBImage();
   UnregisterPALMImage();
+#if defined(MAGICKCORE_PANGO_DELEGATE)
+  UnregisterPANGOImage();
+#endif
   UnregisterPATTERNImage();
   UnregisterPCDImage();
   UnregisterPCLImage();

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 57e65ca234f8f0ca212671bfdbc9506bc1fc9235..fbe2d961e27502ce91c52e80034795647ba113c0 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "exported"
+#define MagickSVNRevision  "5750"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-24"
+#define MagickReleaseDate  "2011-10-26"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index bade535aaa0af72eefdcda6439578083a47bb14a..acef84e65a6c7dec968ec419a22b1e9880a7f16e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -481,24 +481,24 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        coders/map.c coders/mat.c coders/matte.c coders/meta.c \
        coders/miff.c coders/mono.c coders/mpc.c coders/mpeg.c \
        coders/mpr.c coders/msl.c coders/mtv.c coders/mvg.c \
-       coders/null.c coders/otb.c coders/palm.c coders/pattern.c \
-       coders/pcd.c coders/pcl.c coders/pcx.c coders/pdb.c \
-       coders/pdf.c coders/pes.c coders/pict.c coders/pix.c \
-       coders/plasma.c coders/pnm.c coders/preview.c coders/ps.c \
-       coders/ps2.c coders/ps3.c coders/psd.c coders/pwp.c \
-       coders/raw.c coders/rgb.c coders/rla.c coders/rle.c \
-       coders/scr.c coders/sct.c coders/sfw.c coders/sgi.c \
-       coders/stegano.c coders/sun.c coders/svg.c coders/tga.c \
-       coders/thumbnail.c coders/tile.c coders/tim.c coders/ttf.c \
-       coders/txt.c coders/uil.c coders/url.c coders/uyvy.c \
-       coders/vicar.c coders/vid.c coders/viff.c coders/wbmp.c \
-       coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \
-       coders/xpm.c coders/xps.c coders/ycbcr.c coders/yuv.c \
-       coders/dps.c coders/djvu.c coders/exr.c coders/fpx.c \
-       coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \
-       coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \
-       coders/webp.c coders/wmf.c coders/x.c coders/xwd.c \
-       filters/analyze.c
+       coders/null.c coders/otb.c coders/palm.c coders/pango.c \
+       coders/pattern.c coders/pcd.c coders/pcl.c coders/pcx.c \
+       coders/pdb.c coders/pdf.c coders/pes.c coders/pict.c \
+       coders/pix.c coders/plasma.c coders/pnm.c coders/preview.c \
+       coders/ps.c coders/ps2.c coders/ps3.c coders/psd.c \
+       coders/pwp.c coders/raw.c coders/rgb.c coders/rla.c \
+       coders/rle.c coders/scr.c coders/sct.c coders/sfw.c \
+       coders/sgi.c coders/stegano.c coders/sun.c coders/svg.c \
+       coders/tga.c coders/thumbnail.c coders/tile.c coders/tim.c \
+       coders/ttf.c coders/txt.c coders/uil.c coders/url.c \
+       coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c \
+       coders/wbmp.c coders/wpg.c coders/xbm.c coders/xc.c \
+       coders/xcf.c coders/xpm.c coders/xps.c coders/ycbcr.c \
+       coders/yuv.c coders/dps.c coders/djvu.c coders/exr.c \
+       coders/fpx.c coders/clipboard.c coders/emf.c coders/jbig.c \
+       coders/jpeg.c coders/jp2.c coders/png.c coders/ept.c \
+       coders/tiff.c coders/webp.c coders/wmf.c coders/x.c \
+       coders/xwd.c filters/analyze.c
 am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \
        MagickCore/MagickCore_libMagickCore_la-animate.lo \
        MagickCore/MagickCore_libMagickCore_la-annotate.lo \
@@ -663,6 +663,7 @@ am__objects_16 = coders/MagickCore_libMagickCore_la-aai.lo \
        coders/MagickCore_libMagickCore_la-null.lo \
        coders/MagickCore_libMagickCore_la-otb.lo \
        coders/MagickCore_libMagickCore_la-palm.lo \
+       coders/MagickCore_libMagickCore_la-pango.lo \
        coders/MagickCore_libMagickCore_la-pattern.lo \
        coders/MagickCore_libMagickCore_la-pcd.lo \
        coders/MagickCore_libMagickCore_la-pcl.lo \
@@ -1243,6 +1244,14 @@ coders_palm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_palm_la_LDFLAGS) $(LDFLAGS) -o \
        $@
 @WITH_MODULES_TRUE@am_coders_palm_la_rpath = -rpath $(codersdir)
+coders_pango_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(PANGO LIBS)
+am_coders_pango_la_OBJECTS = coders/coders_pango_la-pango.lo
+coders_pango_la_OBJECTS = $(am_coders_pango_la_OBJECTS)
+coders_pango_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(coders_pango_la_LDFLAGS) $(LDFLAGS) \
+       -o $@
+@WITH_MODULES_TRUE@am_coders_pango_la_rpath = -rpath $(codersdir)
 coders_pattern_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
 am_coders_pattern_la_OBJECTS = coders/coders_pattern_la-pattern.lo
 coders_pattern_la_OBJECTS = $(am_coders_pattern_la_OBJECTS)
@@ -2031,39 +2040,39 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(coders_msl_la_SOURCES) $(coders_mtv_la_SOURCES) \
        $(coders_mvg_la_SOURCES) $(coders_null_la_SOURCES) \
        $(coders_otb_la_SOURCES) $(coders_palm_la_SOURCES) \
-       $(coders_pattern_la_SOURCES) $(coders_pcd_la_SOURCES) \
-       $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \
-       $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \
-       $(coders_pes_la_SOURCES) $(coders_pict_la_SOURCES) \
-       $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \
-       $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \
-       $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \
-       $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \
-       $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \
-       $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \
-       $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \
-       $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \
-       $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \
-       $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \
-       $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \
-       $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \
-       $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \
-       $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \
-       $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \
-       $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \
-       $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \
-       $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \
-       $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \
-       $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
-       $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
-       $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
-       $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
-       $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
-       $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \
-       $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
-       $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
-       $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
-       $(Magick___demo_analyze_SOURCES) \
+       $(coders_pango_la_SOURCES) $(coders_pattern_la_SOURCES) \
+       $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \
+       $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \
+       $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \
+       $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \
+       $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \
+       $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \
+       $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \
+       $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \
+       $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \
+       $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \
+       $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \
+       $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \
+       $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \
+       $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \
+       $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \
+       $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \
+       $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \
+       $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \
+       $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \
+       $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \
+       $(coders_viff_la_SOURCES) $(coders_wbmp_la_SOURCES) \
+       $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \
+       $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \
+       $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \
+       $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \
+       $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
+       $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
+       $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \
+       $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \
+       $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \
+       $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \
+       $(ltdl_shl_load_la_SOURCES) $(Magick___demo_analyze_SOURCES) \
        $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
        $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
        $(Magick___demo_gravity_SOURCES) \
@@ -2122,39 +2131,39 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(coders_msl_la_SOURCES) $(coders_mtv_la_SOURCES) \
        $(coders_mvg_la_SOURCES) $(coders_null_la_SOURCES) \
        $(coders_otb_la_SOURCES) $(coders_palm_la_SOURCES) \
-       $(coders_pattern_la_SOURCES) $(coders_pcd_la_SOURCES) \
-       $(coders_pcl_la_SOURCES) $(coders_pcx_la_SOURCES) \
-       $(coders_pdb_la_SOURCES) $(coders_pdf_la_SOURCES) \
-       $(coders_pes_la_SOURCES) $(coders_pict_la_SOURCES) \
-       $(coders_pix_la_SOURCES) $(coders_plasma_la_SOURCES) \
-       $(coders_png_la_SOURCES) $(coders_pnm_la_SOURCES) \
-       $(coders_preview_la_SOURCES) $(coders_ps_la_SOURCES) \
-       $(coders_ps2_la_SOURCES) $(coders_ps3_la_SOURCES) \
-       $(coders_psd_la_SOURCES) $(coders_pwp_la_SOURCES) \
-       $(coders_raw_la_SOURCES) $(coders_rgb_la_SOURCES) \
-       $(coders_rla_la_SOURCES) $(coders_rle_la_SOURCES) \
-       $(coders_scr_la_SOURCES) $(coders_sct_la_SOURCES) \
-       $(coders_sfw_la_SOURCES) $(coders_sgi_la_SOURCES) \
-       $(coders_stegano_la_SOURCES) $(coders_sun_la_SOURCES) \
-       $(coders_svg_la_SOURCES) $(coders_tga_la_SOURCES) \
-       $(coders_thumbnail_la_SOURCES) $(coders_tiff_la_SOURCES) \
-       $(coders_tile_la_SOURCES) $(coders_tim_la_SOURCES) \
-       $(coders_ttf_la_SOURCES) $(coders_txt_la_SOURCES) \
-       $(coders_uil_la_SOURCES) $(coders_url_la_SOURCES) \
-       $(coders_uyvy_la_SOURCES) $(coders_vicar_la_SOURCES) \
-       $(coders_vid_la_SOURCES) $(coders_viff_la_SOURCES) \
-       $(coders_wbmp_la_SOURCES) $(coders_webp_la_SOURCES) \
-       $(coders_wmf_la_SOURCES) $(coders_wpg_la_SOURCES) \
-       $(coders_x_la_SOURCES) $(coders_xbm_la_SOURCES) \
-       $(coders_xc_la_SOURCES) $(coders_xcf_la_SOURCES) \
-       $(coders_xpm_la_SOURCES) $(coders_xps_la_SOURCES) \
-       $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \
-       $(coders_yuv_la_SOURCES) $(filters_analyze_la_SOURCES) \
-       $(ltdl_dld_link_la_SOURCES) $(ltdl_dlopen_la_SOURCES) \
-       $(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
-       $(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
-       $(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
-       $(Magick___demo_analyze_SOURCES) \
+       $(coders_pango_la_SOURCES) $(coders_pattern_la_SOURCES) \
+       $(coders_pcd_la_SOURCES) $(coders_pcl_la_SOURCES) \
+       $(coders_pcx_la_SOURCES) $(coders_pdb_la_SOURCES) \
+       $(coders_pdf_la_SOURCES) $(coders_pes_la_SOURCES) \
+       $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \
+       $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \
+       $(coders_pnm_la_SOURCES) $(coders_preview_la_SOURCES) \
+       $(coders_ps_la_SOURCES) $(coders_ps2_la_SOURCES) \
+       $(coders_ps3_la_SOURCES) $(coders_psd_la_SOURCES) \
+       $(coders_pwp_la_SOURCES) $(coders_raw_la_SOURCES) \
+       $(coders_rgb_la_SOURCES) $(coders_rla_la_SOURCES) \
+       $(coders_rle_la_SOURCES) $(coders_scr_la_SOURCES) \
+       $(coders_sct_la_SOURCES) $(coders_sfw_la_SOURCES) \
+       $(coders_sgi_la_SOURCES) $(coders_stegano_la_SOURCES) \
+       $(coders_sun_la_SOURCES) $(coders_svg_la_SOURCES) \
+       $(coders_tga_la_SOURCES) $(coders_thumbnail_la_SOURCES) \
+       $(coders_tiff_la_SOURCES) $(coders_tile_la_SOURCES) \
+       $(coders_tim_la_SOURCES) $(coders_ttf_la_SOURCES) \
+       $(coders_txt_la_SOURCES) $(coders_uil_la_SOURCES) \
+       $(coders_url_la_SOURCES) $(coders_uyvy_la_SOURCES) \
+       $(coders_vicar_la_SOURCES) $(coders_vid_la_SOURCES) \
+       $(coders_viff_la_SOURCES) $(coders_wbmp_la_SOURCES) \
+       $(coders_webp_la_SOURCES) $(coders_wmf_la_SOURCES) \
+       $(coders_wpg_la_SOURCES) $(coders_x_la_SOURCES) \
+       $(coders_xbm_la_SOURCES) $(coders_xc_la_SOURCES) \
+       $(coders_xcf_la_SOURCES) $(coders_xpm_la_SOURCES) \
+       $(coders_xps_la_SOURCES) $(coders_xwd_la_SOURCES) \
+       $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \
+       $(filters_analyze_la_SOURCES) $(ltdl_dld_link_la_SOURCES) \
+       $(ltdl_dlopen_la_SOURCES) $(ltdl_dyld_la_SOURCES) \
+       $(ltdl_libltdl_la_SOURCES) $(ltdl_libltdlc_la_SOURCES) \
+       $(ltdl_load_add_on_la_SOURCES) $(ltdl_loadlibrary_la_SOURCES) \
+       $(ltdl_shl_load_la_SOURCES) $(Magick___demo_analyze_SOURCES) \
        $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
        $(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
        $(Magick___demo_gravity_SOURCES) \
@@ -2945,6 +2954,7 @@ MAGICKCORE_CODER_SRCS = \
        coders/null.c \
        coders/otb.c \
        coders/palm.c \
+       coders/pango.c \
        coders/pattern.c \
        coders/pcd.c \
        coders/pcl.c \
@@ -3062,6 +3072,7 @@ MAGICKCORE_CODER_SRCS = \
 @WITH_MODULES_TRUE@    coders/null.la \
 @WITH_MODULES_TRUE@    coders/otb.la \
 @WITH_MODULES_TRUE@    coders/palm.la \
+@WITH_MODULES_TRUE@    coders/pango.la \
 @WITH_MODULES_TRUE@    coders/pattern.la \
 @WITH_MODULES_TRUE@    coders/pcd.la \
 @WITH_MODULES_TRUE@    coders/pcl.la \
@@ -3498,6 +3509,12 @@ coders_palm_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_palm_la_LDFLAGS = $(MODULECOMMONFLAGS)
 coders_palm_la_LIBADD = $(MAGICKCORE_LIBS)
 
+# PANGO coder module
+coders_pango_la_SOURCES = coders/pango.c
+coders_pango_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) $(PANGO_CFLAGS)
+coders_pango_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_pango_la_LIBADD = $(MAGICKCORE_LIBS) $(PANGO LIBS)
+
 # Pattern module
 coders_pattern_la_SOURCES = coders/pattern.c
 coders_pattern_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
@@ -5453,6 +5470,8 @@ coders/MagickCore_libMagickCore_la-otb.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/MagickCore_libMagickCore_la-palm.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pango.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
 coders/MagickCore_libMagickCore_la-pattern.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/MagickCore_libMagickCore_la-pcd.lo: coders/$(am__dirstamp) \
@@ -5912,6 +5931,10 @@ coders/coders_palm_la-palm.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/palm.la: $(coders_palm_la_OBJECTS) $(coders_palm_la_DEPENDENCIES) coders/$(am__dirstamp)
        $(AM_V_CCLD)$(coders_palm_la_LINK) $(am_coders_palm_la_rpath) $(coders_palm_la_OBJECTS) $(coders_palm_la_LIBADD) $(LIBS)
+coders/coders_pango_la-pango.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
+coders/pango.la: $(coders_pango_la_OBJECTS) $(coders_pango_la_DEPENDENCIES) coders/$(am__dirstamp)
+       $(AM_V_CCLD)$(coders_pango_la_LINK) $(am_coders_pango_la_rpath) $(coders_pango_la_OBJECTS) $(coders_pango_la_LIBADD) $(LIBS)
 coders/coders_pattern_la-pattern.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/pattern.la: $(coders_pattern_la_OBJECTS) $(coders_pattern_la_DEPENDENCIES) coders/$(am__dirstamp)
@@ -6894,6 +6917,8 @@ mostlyclean-compile:
        -rm -f coders/MagickCore_libMagickCore_la-otb.lo
        -rm -f coders/MagickCore_libMagickCore_la-palm.$(OBJEXT)
        -rm -f coders/MagickCore_libMagickCore_la-palm.lo
+       -rm -f coders/MagickCore_libMagickCore_la-pango.$(OBJEXT)
+       -rm -f coders/MagickCore_libMagickCore_la-pango.lo
        -rm -f coders/MagickCore_libMagickCore_la-pattern.$(OBJEXT)
        -rm -f coders/MagickCore_libMagickCore_la-pattern.lo
        -rm -f coders/MagickCore_libMagickCore_la-pcd.$(OBJEXT)
@@ -7128,6 +7153,8 @@ mostlyclean-compile:
        -rm -f coders/coders_otb_la-otb.lo
        -rm -f coders/coders_palm_la-palm.$(OBJEXT)
        -rm -f coders/coders_palm_la-palm.lo
+       -rm -f coders/coders_pango_la-pango.$(OBJEXT)
+       -rm -f coders/coders_pango_la-pango.lo
        -rm -f coders/coders_pattern_la-pattern.$(OBJEXT)
        -rm -f coders/coders_pattern_la-pattern.lo
        -rm -f coders/coders_pcd_la-pcd.$(OBJEXT)
@@ -7505,6 +7532,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-null.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-otb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-palm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pango.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcl.Plo@am__quote@
@@ -7622,6 +7650,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_null_la-null.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_otb_la-otb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_palm_la-palm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pango_la-pango.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pattern_la-pattern.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pcd_la-pcd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pcl_la-pcl.Plo@am__quote@
@@ -8865,6 +8894,14 @@ coders/MagickCore_libMagickCore_la-palm.lo: coders/palm.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) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-palm.lo `test -f 'coders/palm.c' || echo '$(srcdir)/'`coders/palm.c
 
+coders/MagickCore_libMagickCore_la-pango.lo: coders/pango.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pango.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pango.Tpo -c -o coders/MagickCore_libMagickCore_la-pango.lo `test -f 'coders/pango.c' || echo '$(srcdir)/'`coders/pango.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pango.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pango.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='coders/pango.c' object='coders/MagickCore_libMagickCore_la-pango.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) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pango.lo `test -f 'coders/pango.c' || echo '$(srcdir)/'`coders/pango.c
+
 coders/MagickCore_libMagickCore_la-pattern.lo: coders/pattern.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pattern.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Tpo -c -o coders/MagickCore_libMagickCore_la-pattern.lo `test -f 'coders/pattern.c' || echo '$(srcdir)/'`coders/pattern.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Plo
@@ -10057,6 +10094,14 @@ coders/coders_palm_la-palm.lo: coders/palm.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) $(coders_palm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_palm_la-palm.lo `test -f 'coders/palm.c' || echo '$(srcdir)/'`coders/palm.c
 
+coders/coders_pango_la-pango.lo: coders/pango.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pango_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_pango_la-pango.lo -MD -MP -MF coders/$(DEPDIR)/coders_pango_la-pango.Tpo -c -o coders/coders_pango_la-pango.lo `test -f 'coders/pango.c' || echo '$(srcdir)/'`coders/pango.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_pango_la-pango.Tpo coders/$(DEPDIR)/coders_pango_la-pango.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='coders/pango.c' object='coders/coders_pango_la-pango.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) $(coders_pango_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_pango_la-pango.lo `test -f 'coders/pango.c' || echo '$(srcdir)/'`coders/pango.c
+
 coders/coders_pattern_la-pattern.lo: coders/pattern.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pattern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_pattern_la-pattern.lo -MD -MP -MF coders/$(DEPDIR)/coders_pattern_la-pattern.Tpo -c -o coders/coders_pattern_la-pattern.lo `test -f 'coders/pattern.c' || echo '$(srcdir)/'`coders/pattern.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_pattern_la-pattern.Tpo coders/$(DEPDIR)/coders_pattern_la-pattern.Plo

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 47150371e188fe4696f3fc7c3dac2bf82f9482bd..26695a642f8269723f3c9c6f7b82fe70990efed0 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -135,6 +135,7 @@ MAGICKCORE_CODER_SRCS = \
        coders/null.c \
        coders/otb.c \
        coders/palm.c \
+       coders/pango.c \
        coders/pattern.c \
        coders/pcd.c \
        coders/pcl.c \
@@ -252,6 +253,7 @@ coders_LTLIBRARIES = \
        coders/null.la \
        coders/otb.la \
        coders/palm.la \
+       coders/pango.la \
        coders/pattern.la \
        coders/pcd.la \
        coders/pcl.la \
@@ -690,6 +692,13 @@ coders_palm_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS)
 coders_palm_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_palm_la_LIBADD      = $(MAGICKCORE_LIBS)
 
+# PANGO coder module
+coders_pango_la_SOURCES     = coders/pango.c
+coders_pango_la_CPPFLAGS    = $(MODULE_EXTRA_CPPFLAGS) $(PANGO_CFLAGS)
+coders_pango_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+coders_pango_la_LIBADD      = $(MAGICKCORE_LIBS) $(PANGO LIBS)
+
+
 # Pattern module
 coders_pattern_la_SOURCES   = coders/pattern.c
 coders_pattern_la_CPPFLAGS  = $(MODULE_EXTRA_CPPFLAGS)

diff --git a/coders/pango.c b/coders/pango.c
new file mode 100644 (file)
index 0000000..c2b9008
--- /dev/null
+++ b/coders/pango.c
@@ -0,0 +1,171 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                     PPPP    AAA   N   N   GGGG   OOO                        %
+%                     P   P  A   A  NN  N  G      O   O                       %
+%                     PPPP   AAAAA  N N N  G GGG  O   O                       %
+%                     P   M  A   A  N  NN  G   G  O   O                       %
+%                     P      A   A  N   N   GGGG   OOO                        %
+%                                                                             %
+%                                                                             %
+%                     Read Pango Markup Language Format                       %
+%                                                                             %
+%                              Software Design                                %
+%                                John Cristy                                  %
+%                                 March 2012                                  %
+%                                                                             %
+%                                                                             %
+%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
+%  dedicated to making software imaging solutions freely available.           %
+%                                                                             %
+%  You may not use this file except in compliance with the License.  You may  %
+%  obtain a copy of the License at                                            %
+%                                                                             %
+%    http://www.imagemagick.org/script/license.php                            %
+%                                                                             %
+%  Unless required by applicable law or agreed to in writing, software        %
+%  distributed under the License is distributed on an "AS IS" BASIS,          %
+%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
+%  See the License for the specific language governing permissions and        %
+%  limitations under the License.                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+*/
+\f
+/*
+  Include declarations.
+*/
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/display.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow.h"
+#include "MagickCore/xwindow-private.h"
+#if defined(MAGICKCORE_PANGO_DELEGATE)
+#include <pango/pango.h>
+#endif
+\f
+/*
+  Forward declarations.
+*/
+#if defined(MAGICKCORE_PANGO_DELEGATE)
+static MagickBooleanType
+  WritePANGOImage(const ImageInfo *,Image *);
+#endif
+\f
+#if defined(MAGICKCORE_PANGO_DELEGATE)
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   R e a d P A N G O I m a g e                                                 %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  ReadPANGOImage() reads an image in the Pango Markup Language Format.
+%
+%  The format of the ReadPANGOImage method is:
+%
+%      Image *ReadPANGOImage(const ImageInfo *image_info,
+%        ExceptionInfo *exception)
+%
+%  A description of each parameter follows:
+%
+%    o image_info: the image info.
+%
+%    o exception: return any errors or warnings in this structure.
+%
+*/
+static Image *ReadPANGOImage(const ImageInfo *image_info,
+  ExceptionInfo *exception)
+{
+  return((Image *) NULL);
+}
+#endif
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   R e g i s t e r P A N G O I m a g e                                       %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  RegisterPANGOImage() adds attributes for the Pango Markup Language format to
+%  the list of supported formats.  The attributes include the image format
+%  tag, a method to read and/or write the format, whether the format
+%  supports the saving of more than one frame to the same file or blob,
+%  whether the format supports native in-memory I/O, and a brief
+%  description of the format.
+%
+%  The format of the RegisterPANGOImage method is:
+%
+%      size_t RegisterPANGOImage(void)
+%
+*/
+ModuleExport size_t RegisterPANGOImage(void)
+{
+  MagickInfo
+    *entry;
+
+  entry=SetMagickInfo("PANGO");
+#if defined(MAGICKCORE_PANGO_DELEGATE)
+  entry->decoder=(DecodeImageHandler *) ReadPANGOImage;
+#endif
+  entry->description=ConstantString("Pango Markup Language");
+  entry->adjoin=MagickFalse;
+  entry->module=ConstantString("PANGO");
+  (void) RegisterMagickInfo(entry);
+  return(MagickImageCoderSignature);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   U n r e g i s t e r P A N G O I m a g e                                   %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  UnregisterPANGOImage() removes format registrations made by the Pango module
+%  from the list of supported formats.
+%
+%  The format of the UnregisterPANGOImage method is:
+%
+%      UnregisterPANGOImage(void)
+%
+*/
+ModuleExport void UnregisterPANGOImage(void)
+{
+  (void) UnregisterMagickInfo("PANGO");
+}

diff --git a/config/configure.xml b/config/configure.xml
index 19193215fa8afef1372752aaf42bfb0b7e9c70cf..cd8c384504b439724a1670a213a317d7a99f95be 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,9 +10,9 @@
   <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="5733" />
-  <configure name="RELEASE_DATE" value="2011-10-24"/>
-  <configure name="CONFIGURE" value="./configure  '--disable-shared'"/>
+  <configure name="SVN_REVISION" value="5750" />
+  <configure name="RELEASE_DATE" value="2011-10-26"/>
+  <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
@@ -28,7 +28,7 @@
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib -L/usr/lib"/>
-  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread "/>
+  <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng12 -ldjvulibre -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
   <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>

diff --git a/configure b/configure
index 425daf5914b70d16b7269c23e8d5e6cb0744a133..5167145505260aaa5030e89b5f1c8ab83f920ee0 100755 (executable)
--- a/configure
+++ b/configure
@@ -3583,7 +3583,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=5733
+MAGICK_SVN_REVISION=5750
 
 
 

diff --git a/libtool b/libtool
index b07ec29d58656440e2e89e918cfacadc61a5beab..025fcf37e68489c2ddc449bacc75b73f489fa894 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -74,7 +74,7 @@ DLLTOOL="false"
 OBJDUMP="objdump"
 
 # Whether or not to build shared libraries.
-build_libtool_libs=no
+build_libtool_libs=yes
 
 # Whether or not to build static libraries.
 build_old_libs=yes
@@ -83,7 +83,7 @@ build_old_libs=yes
 pic_mode=default
 
 # Whether or not to optimize for fast installation.
-fast_install=needless
+fast_install=yes
 
 # The host system.
 host_alias=
@@ -323,7 +323,7 @@ link_static_flag=""
 compiler_c_o="yes"
 
 # Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=yes
+build_libtool_need_lc=no
 
 # Whether or not to disallow shared libs when runtime libs are static.
 allow_libtool_libs_with_static_runtimes=no