(no commit message)

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index ff445b6a9e07d02be812f5b1e47cb2660280e4a9..c7a0362659a2e37ad2b8140d862b5eb340f2b626 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -55,7 +55,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/Makefile.in b/Makefile.in
index 2e40fab03b5355a4ac0a14d69c39cf50c1a77063..92259d68af64a0e81e5a4c2e7be149e4d831ca99 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -713,6 +713,13 @@ coders_label_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(coders_label_la_LDFLAGS) $(LDFLAGS) \
        -o $@
 @WITH_MODULES_TRUE@am_coders_label_la_rpath = -rpath $(codersdir)
+coders_mac_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
+am_coders_mac_la_OBJECTS = coders/coders_mac_la-mac.lo
+coders_mac_la_OBJECTS = $(am_coders_mac_la_OBJECTS)
+coders_mac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(coders_mac_la_LDFLAGS) $(LDFLAGS) -o $@
+@WITH_MODULES_TRUE@am_coders_mac_la_rpath = -rpath $(codersdir)
 coders_magick_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
 am_coders_magick_la_OBJECTS = coders/coders_magick_la-magick.lo
 coders_magick_la_OBJECTS = $(am_coders_magick_la_OBJECTS)
@@ -1406,27 +1413,27 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \
        coders/fax.c coders/fits.c coders/gif.c coders/gradient.c \
        coders/gray.c coders/hald.c coders/histogram.c coders/hrz.c \
        coders/html.c coders/icon.c coders/info.c coders/inline.c \
-       coders/ipl.c coders/label.c coders/magick.c 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/wmf.c \
-       coders/x.c coders/xwd.c filters/analyze.c
+       coders/ipl.c coders/label.c coders/mac.c coders/magick.c \
+       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/wmf.c coders/x.c coders/xwd.c filters/analyze.c
 am__objects_2 = magick/magick_libMagickCore_la-accelerate.lo \
        magick/magick_libMagickCore_la-animate.lo \
        magick/magick_libMagickCore_la-annotate.lo \
@@ -1577,6 +1584,7 @@ am__objects_16 = coders/magick_libMagickCore_la-art.lo \
        coders/magick_libMagickCore_la-inline.lo \
        coders/magick_libMagickCore_la-ipl.lo \
        coders/magick_libMagickCore_la-label.lo \
+       coders/magick_libMagickCore_la-mac.lo \
        coders/magick_libMagickCore_la-magick.lo \
        coders/magick_libMagickCore_la-map.lo \
        coders/magick_libMagickCore_la-mat.lo \
@@ -1960,47 +1968,47 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(coders_info_la_SOURCES) $(coders_inline_la_SOURCES) \
        $(coders_ipl_la_SOURCES) $(coders_jbig_la_SOURCES) \
        $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \
-       $(coders_label_la_SOURCES) $(coders_magick_la_SOURCES) \
-       $(coders_map_la_SOURCES) $(coders_mat_la_SOURCES) \
-       $(coders_matte_la_SOURCES) $(coders_meta_la_SOURCES) \
-       $(coders_miff_la_SOURCES) $(coders_mono_la_SOURCES) \
-       $(coders_mpc_la_SOURCES) $(coders_mpeg_la_SOURCES) \
-       $(coders_mpr_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_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_libMagickCore_la_SOURCES) \
+       $(coders_label_la_SOURCES) $(coders_mac_la_SOURCES) \
+       $(coders_magick_la_SOURCES) $(coders_map_la_SOURCES) \
+       $(coders_mat_la_SOURCES) $(coders_matte_la_SOURCES) \
+       $(coders_meta_la_SOURCES) $(coders_miff_la_SOURCES) \
+       $(coders_mono_la_SOURCES) $(coders_mpc_la_SOURCES) \
+       $(coders_mpeg_la_SOURCES) $(coders_mpr_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_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_libMagickCore_la_SOURCES) \
        $(wand_libMagickWand_la_SOURCES) \
        $(Magick___demo_analyze_SOURCES) \
        $(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
@@ -2049,46 +2057,47 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(coders_info_la_SOURCES) $(coders_inline_la_SOURCES) \
        $(coders_ipl_la_SOURCES) $(coders_jbig_la_SOURCES) \
        $(coders_jp2_la_SOURCES) $(coders_jpeg_la_SOURCES) \
-       $(coders_label_la_SOURCES) $(coders_magick_la_SOURCES) \
-       $(coders_map_la_SOURCES) $(coders_mat_la_SOURCES) \
-       $(coders_matte_la_SOURCES) $(coders_meta_la_SOURCES) \
-       $(coders_miff_la_SOURCES) $(coders_mono_la_SOURCES) \
-       $(coders_mpc_la_SOURCES) $(coders_mpeg_la_SOURCES) \
-       $(coders_mpr_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_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) \
+       $(coders_label_la_SOURCES) $(coders_mac_la_SOURCES) \
+       $(coders_magick_la_SOURCES) $(coders_map_la_SOURCES) \
+       $(coders_mat_la_SOURCES) $(coders_matte_la_SOURCES) \
+       $(coders_meta_la_SOURCES) $(coders_miff_la_SOURCES) \
+       $(coders_mono_la_SOURCES) $(coders_mpc_la_SOURCES) \
+       $(coders_mpeg_la_SOURCES) $(coders_mpr_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_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) \
        $(am__magick_libMagickCore_la_SOURCES_DIST) \
        $(wand_libMagickWand_la_SOURCES) \
        $(Magick___demo_analyze_SOURCES) \
@@ -2852,6 +2861,7 @@ MAGICK_CODER_SRCS = \
        coders/inline.c \
        coders/ipl.c \
        coders/label.c \
+       coders/mac.c \
        coders/magick.c \
        coders/map.c \
        coders/mat.c \
@@ -2965,6 +2975,7 @@ MAGICK_CODER_SRCS = \
 @WITH_MODULES_TRUE@    coders/inline.la \
 @WITH_MODULES_TRUE@    coders/ipl.la \
 @WITH_MODULES_TRUE@    coders/label.la \
+@WITH_MODULES_TRUE@    coders/mac.la \
 @WITH_MODULES_TRUE@    coders/magick.la \
 @WITH_MODULES_TRUE@    coders/map.la \
 @WITH_MODULES_TRUE@    coders/mat.la \
@@ -3302,6 +3313,12 @@ coders_label_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 coders_label_la_LDFLAGS = $(MODULECOMMONFLAGS) $(MATH_LIBS)
 coders_label_la_LIBADD = $(MAGICKCORE_LIBS)
 
+# MAC coder module
+coders_mac_la_SOURCES = coders/mac.c
+coders_mac_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+coders_mac_la_LDFLAGS = $(MODULECOMMONFLAGS)
+coders_mac_la_LIBADD = $(MAGICKCORE_LIBS)
+
 # MAGICK coder module
 coders_magick_la_SOURCES = coders/magick.c
 coders_magick_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
@@ -5131,6 +5148,10 @@ coders/coders_label_la-label.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/label.la: $(coders_label_la_OBJECTS) $(coders_label_la_DEPENDENCIES) coders/$(am__dirstamp)
        $(AM_V_CCLD)$(coders_label_la_LINK) $(am_coders_label_la_rpath) $(coders_label_la_OBJECTS) $(coders_label_la_LIBADD) $(LIBS)
+coders/coders_mac_la-mac.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
+coders/mac.la: $(coders_mac_la_OBJECTS) $(coders_mac_la_DEPENDENCIES) coders/$(am__dirstamp)
+       $(AM_V_CCLD)$(coders_mac_la_LINK) $(am_coders_mac_la_rpath) $(coders_mac_la_OBJECTS) $(coders_mac_la_LIBADD) $(LIBS)
 coders/coders_magick_la-magick.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/magick.la: $(coders_magick_la_OBJECTS) $(coders_magick_la_DEPENDENCIES) coders/$(am__dirstamp)
@@ -5738,6 +5759,8 @@ coders/magick_libMagickCore_la-ipl.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/magick_libMagickCore_la-label.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
+coders/magick_libMagickCore_la-mac.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
 coders/magick_libMagickCore_la-magick.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
 coders/magick_libMagickCore_la-map.lo: coders/$(am__dirstamp) \
@@ -6383,6 +6406,8 @@ mostlyclean-compile:
        -rm -f coders/coders_jpeg_la-jpeg.lo
        -rm -f coders/coders_label_la-label.$(OBJEXT)
        -rm -f coders/coders_label_la-label.lo
+       -rm -f coders/coders_mac_la-mac.$(OBJEXT)
+       -rm -f coders/coders_mac_la-mac.lo
        -rm -f coders/coders_magick_la-magick.$(OBJEXT)
        -rm -f coders/coders_magick_la-magick.lo
        -rm -f coders/coders_map_la-map.$(OBJEXT)
@@ -6609,6 +6634,8 @@ mostlyclean-compile:
        -rm -f coders/magick_libMagickCore_la-jpeg.lo
        -rm -f coders/magick_libMagickCore_la-label.$(OBJEXT)
        -rm -f coders/magick_libMagickCore_la-label.lo
+       -rm -f coders/magick_libMagickCore_la-mac.$(OBJEXT)
+       -rm -f coders/magick_libMagickCore_la-mac.lo
        -rm -f coders/magick_libMagickCore_la-magick.$(OBJEXT)
        -rm -f coders/magick_libMagickCore_la-magick.lo
        -rm -f coders/magick_libMagickCore_la-map.$(OBJEXT)
@@ -7107,6 +7134,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_jp2_la-jp2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_jpeg_la-jpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_label_la-label.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_mac_la-mac.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_magick_la-magick.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_map_la-map.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_mat_la-mat.Plo@am__quote@
@@ -7220,6 +7248,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-jp2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-jpeg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-label.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mac.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-magick.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-map.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mat.Plo@am__quote@
@@ -7806,6 +7835,14 @@ coders/coders_label_la-label.lo: coders/label.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_label_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_label_la-label.lo `test -f 'coders/label.c' || echo '$(srcdir)/'`coders/label.c
 
+coders/coders_mac_la-mac.lo: coders/mac.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_mac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_mac_la-mac.lo -MD -MP -MF coders/$(DEPDIR)/coders_mac_la-mac.Tpo -c -o coders/coders_mac_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_mac_la-mac.Tpo coders/$(DEPDIR)/coders_mac_la-mac.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='coders/mac.c' object='coders/coders_mac_la-mac.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_mac_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_mac_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
+
 coders/coders_magick_la-magick.lo: coders/magick.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_magick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_magick_la-magick.lo -MD -MP -MF coders/$(DEPDIR)/coders_magick_la-magick.Tpo -c -o coders/coders_magick_la-magick.lo `test -f 'coders/magick.c' || echo '$(srcdir)/'`coders/magick.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_magick_la-magick.Tpo coders/$(DEPDIR)/coders_magick_la-magick.Plo
@@ -9454,6 +9491,14 @@ coders/magick_libMagickCore_la-label.lo: coders/label.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) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-label.lo `test -f 'coders/label.c' || echo '$(srcdir)/'`coders/label.c
 
+coders/magick_libMagickCore_la-mac.lo: coders/mac.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mac.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mac.Tpo -c -o coders/magick_libMagickCore_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mac.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mac.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='coders/mac.c' object='coders/magick_libMagickCore_la-mac.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) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
+
 coders/magick_libMagickCore_la-magick.lo: coders/magick.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-magick.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-magick.Tpo -c -o coders/magick_libMagickCore_la-magick.lo `test -f 'coders/magick.c' || echo '$(srcdir)/'`coders/magick.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-magick.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-magick.Plo

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 0e0880d0d6502e4b9a4e225d9276c4c24b7f2cf9..b15d01809dfebf81bfcb4089749e783b09b9b753 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -156,7 +156,7 @@ foreach my $delegate (@tested_delegates) {
 }
 
 # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
 my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm';
 my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
 my $LDFLAGS_magick   = "-L../magick/.libs -lMagickCore $Config{'ldflags'} ";
@@ -201,7 +201,7 @@ WriteMakefile
    #'CC' => 'gcc -std=gnu99 -std=gnu99',
 
    # C pre-processor flags (e.g. -I & -D options)
-   # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2",
+   # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2",
 
    # C compiler flags (e.g. -O -g)
    'CCFLAGS' => $CCFLAGS_magick,

diff --git a/coders/Make.com b/coders/Make.com
index 01de8b97268da731517aa76802037e3eb5ac8565..06502b8127c9bc9b3f3756b6c4e182a162b79178 100644 (file)
--- a/coders/Make.com
+++ b/coders/Make.com
@@ -61,6 +61,8 @@ $call Make jbig.c
 $call Make jpeg.c
 $call Make jp2.c
 $call Make label.c
+$call Make mac.c
+$call Make magick.c
 $call Make map.c
 $call Make mat.c
 $call Make matte.c
@@ -137,7 +139,7 @@ $deass wand
 $library/create libCoders.olb art,avs,bgr,bmp,braille,clip,clipboard,cip,cmyk, -
   cut,dcm,dds,debug,dib,dng,dps,dpx,emf,ept,exr,fax,fits,fpx,gif,gradient, -
   gray,hald,histogram,hrz,html,icon,info,inline,ipl,jbig,jpeg,jp2,label,cals, -
-  caption,palm,map,mat,matte, -
+  caption,palm,mac,magick,map,mat,matte, -
   meta,miff,mpc,mpr,msl,mpeg,mono,mtv,mvg,null,otb,pattern,pcd,pcl,pcx,pdb, -
   pdf,pes,pict,pix,plasma,png,pnm,preview,ps,ps2,ps3,psd,pwp,raw,rgb,rla,rle, -
   sct,sfw,sgi,stegano,sun,svg,tga,thumbnail,tiff,tile,tim,ttf,txt,uil,url, -

diff --git a/coders/Makefile.am b/coders/Makefile.am
index 6f16fb6c48a8ad2b84e4727bd2c656c929f36bc3..d1c264196054be5b017253360fe58b24a9bfaf25 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -111,6 +111,7 @@ MAGICK_CODER_SRCS = \
        coders/inline.c \
        coders/ipl.c \
        coders/label.c \
+       coders/mac.c \
        coders/magick.c \
        coders/map.c \
        coders/mat.c \
@@ -224,6 +225,7 @@ coders_LTLIBRARIES = \
        coders/inline.la \
        coders/ipl.la \
        coders/label.la \
+       coders/mac.la \
        coders/magick.la \
        coders/map.la \
        coders/mat.la \
@@ -563,6 +565,12 @@ coders_label_la_CPPFLAGS   = $(MODULE_EXTRA_CPPFLAGS)
 coders_label_la_LDFLAGS    = $(MODULECOMMONFLAGS) $(MATH_LIBS)
 coders_label_la_LIBADD     = $(MAGICKCORE_LIBS)
 
+# MAC coder module
+coders_mac_la_SOURCES      = coders/mac.c
+coders_mac_la_CPPFLAGS     = $(MODULE_EXTRA_CPPFLAGS)
+coders_mac_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+coders_mac_la_LIBADD       = $(MAGICKCORE_LIBS)
+
 # MAGICK coder module
 coders_magick_la_SOURCES   = coders/magick.c
 coders_magick_la_CPPFLAGS  = $(MODULE_EXTRA_CPPFLAGS)

diff --git a/coders/mac.c b/coders/mac.c
new file mode 100644 (file)
index 0000000..ed47fc9
--- /dev/null
+++ b/coders/mac.c
@@ -0,0 +1,278 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                            M   M   AAA    CCCC                              %
+%                            MM MM  A   A  C                                  %
+%                            M M M  AAAAA  C                                  %
+%                            M   M  A   A  C                                  %
+%                            M   M  A   A   CCCC                              %
+%                                                                             %
+%                                                                             %
+%                         Read MacPaint Image Format                          %
+%                                                                             %
+%                              Software Design                                %
+%                                John Cristy                                  %
+%                                 July 1992                                   %
+%                                                                             %
+%                                                                             %
+%  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 "magick/studio.h"
+#include "magick/blob.h"
+#include "magick/blob-private.h"
+#include "magick/cache.h"
+#include "magick/colorspace.h"
+#include "magick/exception.h"
+#include "magick/exception-private.h"
+#include "magick/image.h"
+#include "magick/image-private.h"
+#include "magick/list.h"
+#include "magick/magick.h"
+#include "magick/memory_.h"
+#include "magick/monitor.h"
+#include "magick/monitor-private.h"
+#include "magick/quantum-private.h"
+#include "magick/static.h"
+#include "magick/string_.h"
+#include "magick/module.h"
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   R e a d M A C I m a g e                                                   %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  ReadMACImage() reads an MacPaint image file and returns it.  It
+%  allocates the memory necessary for the new Image structure and returns a
+%  pointer to the new image.
+%
+%  The format of the ReadMACImage method is:
+%
+%      Image *ReadMACImage(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 *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception)
+{
+  Image
+    *image;
+
+  MagickBooleanType
+    status;
+
+  register ssize_t
+    x;
+
+  register PixelPacket
+    *q;
+
+  register unsigned char
+    *p;
+
+  size_t
+    height,
+    length,
+    width;
+
+  ssize_t
+    count,
+    y;
+
+  unsigned char
+    *pixels;
+
+  /*
+    Open image file.
+  */
+  assert(image_info != (const ImageInfo *) NULL);
+  assert(image_info->signature == MagickSignature);
+  if (image_info->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
+      image_info->filename);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickSignature);
+  image=AcquireImage(image_info);
+  status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
+  if (status == MagickFalse)
+    {
+      image=DestroyImageList(image);
+      return((Image *) NULL);
+    }
+  /*
+    Read MAC X image.
+  */
+  width=ReadBlobMSBLong(image);
+  height=ReadBlobMSBLong(image);
+  if (EOFBlob(image) != MagickFalse)
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+  if ((width == 0UL) || (height == 0UL))
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+  do
+  {
+    /*
+      Convert MAC raster image to pixel packets.
+    */
+    image->columns=width;
+    image->rows=height;
+    image->depth=8;
+    if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0))
+      if (image->scene >= (image_info->scene+image_info->number_scenes-1))
+        break;
+    pixels=(unsigned char *) AcquireQuantumMemory(image->columns,
+      4*sizeof(*pixels));
+    if (pixels == (unsigned char *) NULL) 
+      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+    length=(size_t) 4*image->columns;
+    for (y=0; y < (ssize_t) image->rows; y++)
+    {
+      count=ReadBlob(image,length,pixels);
+      if ((size_t) count != length)
+        ThrowReaderException(CorruptImageError,"UnableToReadImageData");
+      p=pixels;
+      q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
+      if (q == (PixelPacket *) NULL)
+        break;
+      for (x=0; x < (ssize_t) image->columns; x++)
+      {
+        q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p++));
+        q->red=ScaleCharToQuantum(*p++);
+        q->green=ScaleCharToQuantum(*p++);
+        q->blue=ScaleCharToQuantum(*p++);
+        if (q->opacity != OpaqueOpacity)
+          image->matte=MagickTrue;
+        q++;
+      }
+      if (SyncAuthenticPixels(image,exception) == MagickFalse)
+        break;
+      if ((image->previous == (Image *) NULL) &&
+          (SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,image->rows) == MagickFalse))
+        break;
+    }
+    pixels=(unsigned char *) RelinquishMagickMemory(pixels);
+    if (EOFBlob(image) != MagickFalse)
+      {
+        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+          image->filename);
+        break;
+      }
+    /*
+      Proceed to next image.
+    */
+    if (image_info->number_scenes != 0)
+      if (image->scene >= (image_info->scene+image_info->number_scenes-1))
+        break;
+    width=ReadBlobMSBLong(image);
+    height=ReadBlobMSBLong(image);
+    if ((width != 0UL) && (height != 0UL))
+      {
+        /*
+          Allocate next image structure.
+        */
+        AcquireNextImage(image_info,image);
+        if (GetNextImageInList(image) == (Image *) NULL)
+          {
+            image=DestroyImageList(image);
+            return((Image *) NULL);
+          }
+        image=SyncNextImageInList(image);
+        status=SetImageProgress(image,LoadImagesTag,TellBlob(image),
+          GetBlobSize(image));
+        if (status == MagickFalse)
+          break;
+      }
+  } while ((width != 0UL) && (height != 0UL));
+  (void) CloseBlob(image);
+  return(GetFirstImageInList(image));
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   R e g i s t e r M A C I m a g e                                           %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  RegisterMACImage() adds attributes for the MAC X image 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 RegisterMACImage method is:
+%
+%      size_t RegisterMACImage(void)
+%
+*/
+ModuleExport size_t RegisterMACImage(void)
+{
+  MagickInfo
+    *entry;
+
+  entry=SetMagickInfo("MAC");
+  entry->decoder=(DecodeImageHandler *) ReadMACImage;
+  entry->description=ConstantString("MAC Paint");
+  entry->module=ConstantString("MAC");
+  (void) RegisterMagickInfo(entry);
+  return(MagickImageCoderSignature);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   U n r e g i s t e r M A C I m a g e                                       %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  UnregisterMACImage() removes format registrations made by the
+%  MAC module from the list of supported formats.
+%
+%  The format of the UnregisterMACImage method is:
+%
+%      UnregisterMACImage(void)
+%
+*/
+ModuleExport void UnregisterMACImage(void)
+{
+  (void) UnregisterMagickInfo("MAC");
+}

diff --git a/config/configure.xml b/config/configure.xml
index c6a46436e7a39a98833b61a28e259b835dcf66e4..d97b822a48b4143fa3bb958f5a990af92fc44648 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,8 +9,8 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x666"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,6,8"/>
-  <configure name="RELEASE_DATE" value="2010-12-24"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="RELEASE_DATE" value="2010-12-28"/>
+  <configure name="CONFIGURE" value="./configure  '--enable-maintainer-mode'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.6"/>
@@ -20,13 +20,13 @@
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib "/>
-  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
+  <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -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"/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
   <configure name="FEATURES" value="OpenMP "/>
-  <configure name="DELEGATES" value="bzlib fontconfig freetype jpeg jng jp2 lcms lzma png tiff x11 xml zlib"/>
+  <configure name="DELEGATES" value="bzlib fontconfig freetype gvc jpeg jng jp2 lcms lzma png tiff x11 xml zlib"/>
   <configure name="COPYRIGHT" value="Copyright (C) 1999-2011 ImageMagick Studio LLC"/>
   <configure name="WEBSITE" value="http://www.imagemagick.org"/>
   <configure name="QuantumDepth" value="16"/>

diff --git a/magick/Magick-config b/magick/Magick-config
index 36b3743240096b2836a7f7caaaaf40efd429552e..f1fac9f610c7c6e5a96ade68efc5aac789c4e33d 100755 (executable)
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/magick/magick-config.h b/magick/magick-config.h
index d5c334e3f5fdb917a31a8120b4e2c73e83895cfb..4e55e56c2613e32a754e29173ab7b6ab93f85bd7 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -105,7 +105,9 @@
 /* #undef GS_DELEGATE */
 
 /* Define if you have GVC library */
-/* #undef GVC_DELEGATE */
+#ifndef MAGICKCORE_GVC_DELEGATE
+#define MAGICKCORE_GVC_DELEGATE 1
+#endif
 
 /* Define to 1 if you have the `argz_add' function. */
 #ifndef MAGICKCORE_HAVE_ARGZ_ADD

diff --git a/magick/methods.h b/magick/methods.h
index e3c409eaa5a073bff9b3793823b577f2320dca51..784c4bf5d857ace37246d55c02f050a880f3151f 100644 (file)
--- a/magick/methods.h
+++ b/magick/methods.h
@@ -906,6 +906,7 @@ extern "C" {
 #define RegisterJP2Image  PrependMagickMethod(RegisterJP2Image)
 #define RegisterJPEGImage  PrependMagickMethod(RegisterJPEGImage)
 #define RegisterLABELImage  PrependMagickMethod(RegisterLABELImage)
+#define RegisterMCPImage  PrependMagickMethod(RegisterMACImage)
 #define RegisterMAGICKImage  PrependMagickMethod(RegisterMAGICKImage)
 #define RegisterMagickInfo  PrependMagickMethod(RegisterMagickInfo)
 #define RegisterMAPImage  PrependMagickMethod(RegisterMAPImage)
@@ -1235,6 +1236,7 @@ extern "C" {
 #define UnregisterJP2Image  PrependMagickMethod(UnregisterJP2Image)
 #define UnregisterJPEGImage  PrependMagickMethod(UnregisterJPEGImage)
 #define UnregisterLABELImage  PrependMagickMethod(UnregisterLABELImage)
+#define UnregisterMACImage  PrependMagickMethod(UnregisterMACImage)
 #define UnregisterMAGICKImage  PrependMagickMethod(UnregisterMAGICKImage)
 #define UnregisterMagickInfo  PrependMagickMethod(UnregisterMagickInfo)
 #define UnregisterMAPImage  PrependMagickMethod(UnregisterMAPImage)

diff --git a/magick/static.c b/magick/static.c
index 592af42c990cf84629aa68e49ab1693d2f752b99..39d940fb43d2aef6202bd477ce5bf991e45e938b 100644 (file)
--- a/magick/static.c
+++ b/magick/static.c
@@ -227,6 +227,7 @@ MagickExport void RegisterStaticModules(void)
   (void) RegisterJP2Image();
 #endif
   (void) RegisterLABELImage();
+  (void) RegisterMACImage();
   (void) RegisterMAGICKImage();
   (void) RegisterMAPImage();
   (void) RegisterMATImage();
@@ -395,6 +396,7 @@ MagickExport void UnregisterStaticModules(void)
   UnregisterJP2Image();
 #endif
   UnregisterLABELImage();
+  UnregisterMACImage();
   UnregisterMAGICKImage();
   UnregisterMAPImage();
   UnregisterMATImage();

diff --git a/magick/static.h b/magick/static.h
index a32a76bed30bde81a1ccdfa95ea5d2fa269573cd..018a0ec6e98081e4653b802df66e0fdd8160aa3e 100644 (file)
--- a/magick/static.h
+++ b/magick/static.h
@@ -83,6 +83,7 @@ extern ModuleExport size_t
   RegisterJPEGImage(void),
   RegisterJP2Image(void),
   RegisterLABELImage(void),
+  RegisterMACImage(void),
   RegisterMAGICKImage(void),
   RegisterMAPImage(void),
   RegisterMATImage(void),
@@ -232,6 +233,7 @@ extern ModuleExport void
   UnregisterJP2Image(void),
   UnregisterLABELImage(void),
   UnregisterLOCALEImage(void),
+  UnregisterMACImage(void),
   UnregisterMAGICKImage(void),
   UnregisterMAPImage(void),
   UnregisterMATImage(void),

diff --git a/magick/version.h b/magick/version.h
index 20a2842ecbc55866755e964ff2ead086fb74a2ef..4b8833e70480c139694f7791aebf1371eb85b094 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-8"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-12-24"
-#define MagickChangeDate   "20101221"
+#define MagickReleaseDate  "2010-12-28"
+#define MagickChangeDate   "20101226"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/wand/Wand-config b/wand/Wand-config
index 879e982036d6bfbcb277c5530e9527fa6676ff06..29911a18947d18e082f703251a997e447251d506 100755 (executable)
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -52,7 +52,7 @@ while test $# -gt 0; do
       echo '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2