From 9caa8359618faa9d67584a2907942665a0d773db Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 5 Mar 2017 10:12:44 -0500 Subject: [PATCH] ... --- Makefile.in | 183 +++++++++++++++++++++++++++------------------ coders/Makefile.am | 8 ++ coders/pgx.c | 6 +- configure | 2 +- 4 files changed, 122 insertions(+), 77 deletions(-) diff --git a/Makefile.in b/Makefile.in index 01c69b3a6..3a3120112 100644 --- a/Makefile.in +++ b/Makefile.in @@ -510,23 +510,23 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC coders/mtv.c coders/mvg.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/ps.c coders/ps2.c coders/ps3.c \ - coders/psd.c coders/psd-private.h coders/pwp.c coders/raw.c \ - coders/rgb.c coders/rgf.c coders/rla.c coders/rle.c \ - coders/scr.c coders/screenshot.c coders/sct.c coders/sfw.c \ - coders/sgi.c coders/sixel.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/vips.c coders/wbmp.c coders/wpg.c \ - coders/xbm.c coders/xc.c coders/xcf.c coders/xpm.c \ - coders/xps.c coders/xtrn.c coders/ycbcr.c coders/yuv.c \ - coders/dps.c coders/djvu.c coders/exr.c coders/flif.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/pes.c coders/pgx.c coders/pict.c coders/pix.c \ + coders/plasma.c coders/pnm.c coders/ps.c coders/ps2.c \ + coders/ps3.c coders/psd.c coders/psd-private.h coders/pwp.c \ + coders/raw.c coders/rgb.c coders/rgf.c coders/rla.c \ + coders/rle.c coders/scr.c coders/screenshot.c coders/sct.c \ + coders/sfw.c coders/sgi.c coders/sixel.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/vips.c coders/wbmp.c \ + coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \ + coders/xpm.c coders/xps.c coders/xtrn.c coders/ycbcr.c \ + coders/yuv.c coders/dps.c coders/djvu.c coders/exr.c \ + coders/flif.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_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \ MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \ MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.lo \ @@ -702,6 +702,7 @@ am__objects_17 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pdb.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pdf.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pes.lo \ + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pix.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-plasma.lo \ @@ -1393,6 +1394,13 @@ 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_pgx_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +am_coders_pgx_la_OBJECTS = coders/coders_pgx_la-pgx.lo +coders_pgx_la_OBJECTS = $(am_coders_pgx_la_OBJECTS) +coders_pgx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(coders_pgx_la_LDFLAGS) $(LDFLAGS) -o $@ +@WITH_MODULES_TRUE@am_coders_pgx_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) @@ -2042,33 +2050,34 @@ SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_ $(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_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_rgf_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_sixel_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_vips_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_xtrn_la_SOURCES) $(coders_xwd_la_SOURCES) \ - $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ - $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \ + $(coders_pes_la_SOURCES) $(coders_pgx_la_SOURCES) \ + $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \ + $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \ + $(coders_pnm_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_rgf_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_sixel_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_vips_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_xtrn_la_SOURCES) \ + $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \ + $(coders_yuv_la_SOURCES) $(filters_analyze_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) \ @@ -2129,33 +2138,34 @@ DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUF $(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_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_rgf_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_sixel_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_vips_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_xtrn_la_SOURCES) $(coders_xwd_la_SOURCES) \ - $(coders_ycbcr_la_SOURCES) $(coders_yuv_la_SOURCES) \ - $(filters_analyze_la_SOURCES) $(Magick___demo_analyze_SOURCES) \ + $(coders_pes_la_SOURCES) $(coders_pgx_la_SOURCES) \ + $(coders_pict_la_SOURCES) $(coders_pix_la_SOURCES) \ + $(coders_plasma_la_SOURCES) $(coders_png_la_SOURCES) \ + $(coders_pnm_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_rgf_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_sixel_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_vips_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_xtrn_la_SOURCES) \ + $(coders_xwd_la_SOURCES) $(coders_ycbcr_la_SOURCES) \ + $(coders_yuv_la_SOURCES) $(filters_analyze_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) \ @@ -3158,6 +3168,7 @@ MAGICKCORE_CODER_SRCS = \ coders/pdb.c \ coders/pdf.c \ coders/pes.c \ + coders/pgx.c \ coders/pict.c \ coders/pix.c \ coders/plasma.c \ @@ -3286,6 +3297,7 @@ MAGICKCORE_CODER_SRCS = \ @WITH_MODULES_TRUE@ coders/pdb.la \ @WITH_MODULES_TRUE@ coders/pdf.la \ @WITH_MODULES_TRUE@ coders/pes.la \ +@WITH_MODULES_TRUE@ coders/pgx.la \ @WITH_MODULES_TRUE@ coders/pict.la \ @WITH_MODULES_TRUE@ coders/pix.la \ @WITH_MODULES_TRUE@ coders/plasma.la \ @@ -3797,6 +3809,12 @@ coders_pes_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_pes_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_pes_la_LIBADD = $(MAGICKCORE_LIBS) +# PGX coder module +coders_pgx_la_SOURCES = coders/pgx.c +coders_pgx_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) +coders_pgx_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_pgx_la_LIBADD = $(MAGICKCORE_LIBS) + # PICT coder module coders_pict_la_SOURCES = coders/pict.c coders_pict_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) @@ -5867,6 +5885,8 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pd coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pes.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.lo: \ + coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pix.lo: \ @@ -6460,6 +6480,11 @@ coders/coders_pes_la-pes.lo: coders/$(am__dirstamp) \ coders/pes.la: $(coders_pes_la_OBJECTS) $(coders_pes_la_DEPENDENCIES) $(EXTRA_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_pgx_la-pgx.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) + +coders/pgx.la: $(coders_pgx_la_OBJECTS) $(coders_pgx_la_DEPENDENCIES) $(EXTRA_coders_pgx_la_DEPENDENCIES) coders/$(am__dirstamp) + $(AM_V_CCLD)$(coders_pgx_la_LINK) $(am_coders_pgx_la_rpath) $(coders_pgx_la_OBJECTS) $(coders_pgx_la_LIBADD) $(LIBS) coders/coders_pict_la-pict.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) @@ -7270,6 +7295,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pdf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-plasma.Plo@am__quote@ @@ -7397,6 +7423,7 @@ distclean-compile: @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_pgx_la-pgx.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@ @@ -8579,6 +8606,13 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pe @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.lo: coders/pgx.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_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.lo `test -f 'coders/pgx.c' || echo '$(srcdir)/'`coders/pgx.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/pgx.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pgx.lo `test -f 'coders/pgx.c' || echo '$(srcdir)/'`coders/pgx.c + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_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) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pict.Plo @@ -9720,6 +9754,13 @@ coders/coders_pes_la-pes.lo: coders/pes.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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_pgx_la-pgx.lo: coders/pgx.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pgx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_pgx_la-pgx.lo -MD -MP -MF coders/$(DEPDIR)/coders_pgx_la-pgx.Tpo -c -o coders/coders_pgx_la-pgx.lo `test -f 'coders/pgx.c' || echo '$(srcdir)/'`coders/pgx.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_pgx_la-pgx.Tpo coders/$(DEPDIR)/coders_pgx_la-pgx.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/pgx.c' object='coders/coders_pgx_la-pgx.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_pgx_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_pgx_la-pgx.lo `test -f 'coders/pgx.c' || echo '$(srcdir)/'`coders/pgx.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 diff --git a/coders/Makefile.am b/coders/Makefile.am index 313392867..907417a7c 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -156,6 +156,7 @@ MAGICKCORE_CODER_SRCS = \ coders/pdb.c \ coders/pdf.c \ coders/pes.c \ + coders/pgx.c \ coders/pict.c \ coders/pix.c \ coders/plasma.c \ @@ -284,6 +285,7 @@ coders_LTLIBRARIES = \ coders/pdb.la \ coders/pdf.la \ coders/pes.la \ + coders/pgx.la \ coders/pict.la \ coders/pix.la \ coders/plasma.la \ @@ -797,6 +799,12 @@ coders_pes_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_pes_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_pes_la_LIBADD = $(MAGICKCORE_LIBS) +# PGX coder module +coders_pgx_la_SOURCES = coders/pgx.c +coders_pgx_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) +coders_pgx_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_pgx_la_LIBADD = $(MAGICKCORE_LIBS) + # PICT coder module coders_pict_la_SOURCES = coders/pict.c coders_pict_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) diff --git a/coders/pgx.c b/coders/pgx.c index e014905ff..e03981f87 100644 --- a/coders/pgx.c +++ b/coders/pgx.c @@ -88,14 +88,10 @@ static MagickBooleanType % % A description of each parameter follows: % -% o status: Method IsPGX returns True if the image format type is PGX. -% -% o magick: This string is generally the first few bytes of an image file -% or blob. +% o magick: compare image format pattern against these bytes. % % o length: Specifies the length of the magick string. % -% */ static unsigned int IsPGX(const unsigned char *magick,const size_t length) { diff --git a/configure b/configure index dc210573f..e1dd59e15 100755 --- a/configure +++ b/configure @@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=2 MAGICK_VERSION=7.0.5-2 -MAGICK_GIT_REVISION=19673:9f4e013:20170305 +MAGICK_GIT_REVISION=19674:68ea6a0:20170305 # Substitute library versioning -- 2.40.0