From: cristy Date: Sun, 24 Jan 2010 17:14:03 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10066 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7adb4dba035b9c438a6fbe93867120b700f73acc;p=imagemagick --- diff --git a/Makefile.in b/Makefile.in index 0573a2125..286eb0379 100644 --- a/Makefile.in +++ b/Makefile.in @@ -862,6 +862,13 @@ coders_pdf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(coders_pdf_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_pdf_la_rpath = -rpath $(codersdir) +coders_pes_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +am_coders_pes_la_OBJECTS = coders/coders_pes_la-pes.lo +coders_pes_la_OBJECTS = $(am_coders_pes_la_OBJECTS) +coders_pes_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(coders_pes_la_LDFLAGS) $(LDFLAGS) -o $@ +@WITH_MODULES_TRUE@am_coders_pes_la_rpath = -rpath $(codersdir) coders_pict_la_DEPENDENCIES = $(MAGICKCORE_LIBS) am_coders_pict_la_OBJECTS = coders/coders_pict_la-pict.lo coders_pict_la_OBJECTS = $(am_coders_pict_la_OBJECTS) @@ -1382,21 +1389,22 @@ am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \ 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/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/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 \ @@ -1566,6 +1574,7 @@ am__objects_16 = coders/magick_libMagickCore_la-art.lo \ coders/magick_libMagickCore_la-pcx.lo \ coders/magick_libMagickCore_la-pdb.lo \ coders/magick_libMagickCore_la-pdf.lo \ + coders/magick_libMagickCore_la-pes.lo \ coders/magick_libMagickCore_la-pict.lo \ coders/magick_libMagickCore_la-pix.lo \ coders/magick_libMagickCore_la-plasma.lo \ @@ -1936,35 +1945,36 @@ SOURCES = $(Magick___lib_libMagick___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_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_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) \ @@ -2023,35 +2033,35 @@ DIST_SOURCES = $(Magick___lib_libMagick___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_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_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) \ @@ -2822,6 +2832,7 @@ MAGICK_CODER_SRCS = \ coders/pcx.c \ coders/pdb.c \ coders/pdf.c \ + coders/pes.c \ coders/pict.c \ coders/pix.c \ coders/plasma.c \ @@ -2932,6 +2943,7 @@ MAGICK_CODER_SRCS = \ @WITH_MODULES_TRUE@ coders/pcx.la \ @WITH_MODULES_TRUE@ coders/pdb.la \ @WITH_MODULES_TRUE@ coders/pdf.la \ +@WITH_MODULES_TRUE@ coders/pes.la \ @WITH_MODULES_TRUE@ coders/pict.la \ @WITH_MODULES_TRUE@ coders/pix.la \ @WITH_MODULES_TRUE@ coders/plasma.la \ @@ -3366,6 +3378,12 @@ coders_pdf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_pdf_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS) +# PES coder module +coders_pes_la_SOURCES = coders/pes.c +coders_pes_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) +coders_pes_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_pes_la_LIBADD = $(MAGICKCORE_LIBS) + # PICT coder module coders_pict_la_SOURCES = coders/pict.c coders_pict_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) @@ -5127,6 +5145,10 @@ coders/coders_pdf_la-pdf.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/pdf.la: $(coders_pdf_la_OBJECTS) $(coders_pdf_la_DEPENDENCIES) coders/$(am__dirstamp) $(AM_V_CCLD)$(coders_pdf_la_LINK) $(am_coders_pdf_la_rpath) $(coders_pdf_la_OBJECTS) $(coders_pdf_la_LIBADD) $(LIBS) +coders/coders_pes_la-pes.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) +coders/pes.la: $(coders_pes_la_OBJECTS) $(coders_pes_la_DEPENDENCIES) coders/$(am__dirstamp) + $(AM_V_CCLD)$(coders_pes_la_LINK) $(am_coders_pes_la_rpath) $(coders_pes_la_OBJECTS) $(coders_pes_la_LIBADD) $(LIBS) coders/coders_pict_la-pict.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/pict.la: $(coders_pict_la_OBJECTS) $(coders_pict_la_DEPENDENCIES) coders/$(am__dirstamp) @@ -5680,6 +5702,8 @@ coders/magick_libMagickCore_la-pdb.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libMagickCore_la-pdf.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) +coders/magick_libMagickCore_la-pes.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libMagickCore_la-pict.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) coders/magick_libMagickCore_la-pix.lo: coders/$(am__dirstamp) \ @@ -6319,6 +6343,8 @@ mostlyclean-compile: -rm -f coders/coders_pdb_la-pdb.lo -rm -f coders/coders_pdf_la-pdf.$(OBJEXT) -rm -f coders/coders_pdf_la-pdf.lo + -rm -f coders/coders_pes_la-pes.$(OBJEXT) + -rm -f coders/coders_pes_la-pes.lo -rm -f coders/coders_pict_la-pict.$(OBJEXT) -rm -f coders/coders_pict_la-pict.lo -rm -f coders/coders_pix_la-pix.$(OBJEXT) @@ -6539,6 +6565,8 @@ mostlyclean-compile: -rm -f coders/magick_libMagickCore_la-pdb.lo -rm -f coders/magick_libMagickCore_la-pdf.$(OBJEXT) -rm -f coders/magick_libMagickCore_la-pdf.lo + -rm -f coders/magick_libMagickCore_la-pes.$(OBJEXT) + -rm -f coders/magick_libMagickCore_la-pes.lo -rm -f coders/magick_libMagickCore_la-pict.$(OBJEXT) -rm -f coders/magick_libMagickCore_la-pict.lo -rm -f coders/magick_libMagickCore_la-pix.$(OBJEXT) @@ -7009,6 +7037,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pcx_la-pcx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pdb_la-pdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pdf_la-pdf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pes_la-pes.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pict_la-pict.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_pix_la-pix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_plasma_la-plasma.Plo@am__quote@ @@ -7119,6 +7148,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pcx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pdf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pes.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pict.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-plasma.Plo@am__quote@ @@ -7841,6 +7871,14 @@ coders/coders_pdf_la-pdf.lo: coders/pdf.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_pdf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_pdf_la-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c +coders/coders_pes_la-pes.lo: coders/pes.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_pes_la-pes.lo -MD -MP -MF coders/$(DEPDIR)/coders_pes_la-pes.Tpo -c -o coders/coders_pes_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_pes_la-pes.Tpo coders/$(DEPDIR)/coders_pes_la-pes.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pes.c' object='coders/coders_pes_la-pes.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_pes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_pes_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c + coders/coders_pict_la-pict.lo: coders/pict.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pict_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_pict_la-pict.lo -MD -MP -MF coders/$(DEPDIR)/coders_pict_la-pict.Tpo -c -o coders/coders_pict_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_pict_la-pict.Tpo coders/$(DEPDIR)/coders_pict_la-pict.Plo @@ -9457,6 +9495,14 @@ coders/magick_libMagickCore_la-pdf.lo: coders/pdf.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-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c +coders/magick_libMagickCore_la-pes.lo: coders/pes.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-pes.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pes.Tpo -c -o coders/magick_libMagickCore_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pes.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pes.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pes.c' object='coders/magick_libMagickCore_la-pes.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-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c + coders/magick_libMagickCore_la-pict.lo: coders/pict.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-pict.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pict.Tpo -c -o coders/magick_libMagickCore_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pict.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pict.Plo diff --git a/coders/Makefile.am b/coders/Makefile.am index af33e4063..693840e87 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -131,6 +131,7 @@ MAGICK_CODER_SRCS = \ coders/pcx.c \ coders/pdb.c \ coders/pdf.c \ + coders/pes.c \ coders/pict.c \ coders/pix.c \ coders/plasma.c \ @@ -241,6 +242,7 @@ coders_LTLIBRARIES = \ coders/pcx.la \ coders/pdb.la \ coders/pdf.la \ + coders/pes.la \ coders/pict.la \ coders/pix.la \ coders/plasma.la \ @@ -678,6 +680,12 @@ coders_pdf_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) coders_pdf_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_pdf_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(GS_LIBS) $(MATH_LIBS) +# PES coder module +coders_pes_la_SOURCES = coders/pes.c +coders_pes_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) +coders_pes_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_pes_la_LIBADD = $(MAGICKCORE_LIBS) + # PICT coder module coders_pict_la_SOURCES = coders/pict.c coders_pict_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS) diff --git a/coders/pes.c b/coders/pes.c new file mode 100644 index 000000000..ce645d218 --- /dev/null +++ b/coders/pes.c @@ -0,0 +1,219 @@ +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% PPPP EEEEE SSSSS % +% P P E SS % +% PPPP EEE SSS % +% P E SS % +% P EEEEE SSSSS % +% % +% % +% Read/Write Brother PES Image Format % +% % +% Software Design % +% John Cristy % +% July 2009 % +% % +% % +% Copyright 1999-2010 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. % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% +*/ + +/* + Include declarations. +*/ +#include "magick/studio.h" +#include "magick/property.h" +#include "magick/blob.h" +#include "magick/blob-private.h" +#include "magick/cache.h" +#include "magick/client.h" +#include "magick/colorspace.h" +#include "magick/constitute.h" +#include "magick/decorate.h" +#include "magick/exception.h" +#include "magick/exception-private.h" +#include "magick/gem.h" +#include "magick/geometry.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/montage.h" +#include "magick/resize.h" +#include "magick/shear.h" +#include "magick/quantum-private.h" +#include "magick/static.h" +#include "magick/string_.h" +#include "magick/module.h" +#include "magick/transform.h" +#include "magick/utility.h" + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% I s P E S % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% IsPES() returns MagickTrue if the image format type, identified by the +% magick string, is PES. +% +% The format of the IsPES method is: +% +% MagickBooleanType IsPES(const unsigned char *magick,const size_t length) +% +% A description of each parameter follows: +% +% o magick: compare image format pattern against these bytes. +% +% o length: Specifies the length of the magick string. +% +*/ +static MagickBooleanType IsPES(const unsigned char *magick,const size_t length) +{ + if (length < 4) + return(MagickFalse); + if (LocaleNCompare((const char *) magick,"#PES",4) == 0) + return(MagickTrue); + return(MagickFalse); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e a d P E S I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ReadPESImage() reads a Brother PES 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 ReadPESImage method is: +% +% image=ReadPESImage(image_info) +% +% A description of each parameter follows: +% +% o image_info: the image info. +% +% o exception: return any errors or warnings in this structure. +% +*/ +static Image *ReadPESImage(const ImageInfo *image_info,ExceptionInfo *exception) +{ + Image + *image; + + MagickBooleanType + status; + + /* + 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); + } + return(GetFirstImageInList(image)); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% R e g i s t e r P E S I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% RegisterPESImage() adds attributes for the PES 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 RegisterPESImage method is: +% +% unsigned long RegisterPESImage(void) +% +*/ +ModuleExport unsigned long RegisterPESImage(void) +{ + MagickInfo + *entry; + + entry=SetMagickInfo("PES"); + entry->decoder=(DecodeImageHandler *) ReadPESImage; + entry->magick=(IsImageFormatHandler *) IsPES; + entry->adjoin=MagickFalse; + entry->description=ConstantString("Brother PES"); + entry->module=ConstantString("PES"); + return(MagickImageCoderSignature); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% U n r e g i s t e r P E S I m a g e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% UnregisterPESImage() removes format registrations made by the +% PES module from the list of supported formats. +% +% The format of the UnregisterPESImage method is: +% +% UnregisterPESImage(void) +% +*/ +ModuleExport void UnregisterPESImage(void) +{ + (void) UnregisterMagickInfo("PES"); +} diff --git a/magick/magic.c b/magick/magic.c index a5d6f8793..5b3b38fa8 100644 --- a/magick/magic.c +++ b/magick/magic.c @@ -146,6 +146,7 @@ static const MagicMapInfo { "PCX", 0, MagickString("\012\005") }, { "PDB", 60, MagickString("vIMGView") }, { "PDF", 0, MagickString("%PDF-") }, + { "PES", 0, MagickString("#PES") }, { "PFA", 0, MagickString("%!PS-AdobeFont-1.0") }, { "PFB", 6, MagickString("%!PS-AdobeFont-1.0") }, { "PGX", 0, MagickString("\050\107\020\115\046") },