From 6022193aee0f034b03f219d285d4a4a682a9ef92 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 13 Jul 2019 09:30:46 -0400 Subject: [PATCH] ... --- Makefile.in | 122 ++++++++++++++++++++++++++++++++++++--------------- coders/pnm.c | 2 +- configure | 2 +- 3 files changed, 88 insertions(+), 38 deletions(-) diff --git a/Makefile.in b/Makefile.in index d3555011e..7dbd48b13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -543,16 +543,17 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC 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/heic.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/tile.c coders/tim.c coders/tim2.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/heic.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/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \ MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.lo \ MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.lo \ @@ -757,6 +758,7 @@ am__objects_18 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-thumbnail.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tile.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim.lo \ + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-txt.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-uil.lo \ @@ -1662,6 +1664,14 @@ coders_tim_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(coders_tim_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODULES_TRUE@am_coders_tim_la_rpath = -rpath $(codersdir) +coders_tim2_la_DEPENDENCIES = $(MAGICKCORE_LIBS) +am_coders_tim2_la_OBJECTS = coders/tim2_la-tim2.lo +coders_tim2_la_OBJECTS = $(am_coders_tim2_la_OBJECTS) +coders_tim2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(coders_tim2_la_LDFLAGS) $(LDFLAGS) -o \ + $@ +@WITH_MODULES_TRUE@am_coders_tim2_la_rpath = -rpath $(codersdir) coders_ttf_la_DEPENDENCIES = $(MAGICKCORE_LIBS) am_coders_ttf_la_OBJECTS = coders/ttf_la-ttf.lo coders_ttf_la_OBJECTS = $(am_coders_ttf_la_OBJECTS) @@ -2263,6 +2273,7 @@ am__depfiles_remade = Magick++/demo/$(DEPDIR)/analyze-analyze.Po \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tiff.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tile.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim.Plo \ + coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-txt.Plo \ coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-uil.Plo \ @@ -2390,6 +2401,7 @@ am__depfiles_remade = Magick++/demo/$(DEPDIR)/analyze-analyze.Po \ coders/$(DEPDIR)/tiff_la-psd.Plo \ coders/$(DEPDIR)/tiff_la-tiff.Plo \ coders/$(DEPDIR)/tile_la-tile.Plo \ + coders/$(DEPDIR)/tim2_la-tim2.Plo \ coders/$(DEPDIR)/tim_la-tim.Plo \ coders/$(DEPDIR)/ttf_la-ttf.Plo \ coders/$(DEPDIR)/txt_la-txt.Plo \ @@ -2510,19 +2522,20 @@ SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_ $(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_tim_la_SOURCES) $(coders_tim2_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) \ @@ -2598,19 +2611,20 @@ DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUF $(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_tim_la_SOURCES) $(coders_tim2_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) \ @@ -3659,6 +3673,7 @@ MAGICKCORE_CODER_SRCS = \ coders/thumbnail.c \ coders/tile.c \ coders/tim.c \ + coders/tim2.c \ coders/ttf.c \ coders/txt.c \ coders/uil.c \ @@ -3807,6 +3822,7 @@ CODERS_NOINST_HDRS = \ coders/tiff.h \ coders/tile.h \ coders/tim.h \ + coders/tim2.h \ coders/ttf.h \ coders/txt.h \ coders/uil.h \ @@ -3924,6 +3940,7 @@ CODERS_NOINST_HDRS = \ @WITH_MODULES_TRUE@ coders/thumbnail.la \ @WITH_MODULES_TRUE@ coders/tile.la \ @WITH_MODULES_TRUE@ coders/tim.la \ +@WITH_MODULES_TRUE@ coders/tim2.la \ @WITH_MODULES_TRUE@ coders/ttf.la \ @WITH_MODULES_TRUE@ coders/txt.la \ @WITH_MODULES_TRUE@ coders/uil.la \ @@ -4590,6 +4607,12 @@ coders_tim_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_tim_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_tim_la_LIBADD = $(MAGICKCORE_LIBS) +# TIM2 coder module +coders_tim2_la_SOURCES = coders/tim2.c +coders_tim2_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) +coders_tim2_la_LDFLAGS = $(MODULECOMMONFLAGS) +coders_tim2_la_LIBADD = $(MAGICKCORE_LIBS) + # TTF coder module coders_ttf_la_SOURCES = coders/ttf.c coders_ttf_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) @@ -6624,6 +6647,8 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ti coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.lo: \ + coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-txt.lo: \ @@ -7317,6 +7342,11 @@ coders/tim_la-tim.lo: coders/$(am__dirstamp) \ coders/tim.la: $(coders_tim_la_OBJECTS) $(coders_tim_la_DEPENDENCIES) $(EXTRA_coders_tim_la_DEPENDENCIES) coders/$(am__dirstamp) $(AM_V_CCLD)$(coders_tim_la_LINK) $(am_coders_tim_la_rpath) $(coders_tim_la_OBJECTS) $(coders_tim_la_LIBADD) $(LIBS) +coders/tim2_la-tim2.lo: coders/$(am__dirstamp) \ + coders/$(DEPDIR)/$(am__dirstamp) + +coders/tim2.la: $(coders_tim2_la_OBJECTS) $(coders_tim2_la_DEPENDENCIES) $(EXTRA_coders_tim2_la_DEPENDENCIES) coders/$(am__dirstamp) + $(AM_V_CCLD)$(coders_tim2_la_LINK) $(am_coders_tim2_la_rpath) $(coders_tim2_la_OBJECTS) $(coders_tim2_la_LIBADD) $(LIBS) coders/ttf_la-ttf.lo: coders/$(am__dirstamp) \ coders/$(DEPDIR)/$(am__dirstamp) @@ -7952,6 +7982,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tiff.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tile.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-txt.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-uil.Plo@am__quote@ # am--include-marker @@ -8080,6 +8111,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/tiff_la-psd.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/tiff_la-tiff.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/tile_la-tile.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/tim2_la-tim2.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/tim_la-tim.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/ttf_la-ttf.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/txt_la-txt.Plo@am__quote@ # am--include-marker @@ -9436,6 +9468,13 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ti @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-tim.lo `test -f 'coders/tim.c' || echo '$(srcdir)/'`coders/tim.c +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.lo: coders/tim2.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-tim2.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.lo `test -f 'coders/tim2.c' || echo '$(srcdir)/'`coders/tim2.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/tim2.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.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-tim2.lo `test -f 'coders/tim2.c' || echo '$(srcdir)/'`coders/tim2.c + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.lo: coders/ttf.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-ttf.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.lo `test -f 'coders/ttf.c' || echo '$(srcdir)/'`coders/ttf.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.Plo @@ -10612,6 +10651,13 @@ coders/tim_la-tim.lo: coders/tim.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_tim_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/tim_la-tim.lo `test -f 'coders/tim.c' || echo '$(srcdir)/'`coders/tim.c +coders/tim2_la-tim2.lo: coders/tim2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_tim2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/tim2_la-tim2.lo -MD -MP -MF coders/$(DEPDIR)/tim2_la-tim2.Tpo -c -o coders/tim2_la-tim2.lo `test -f 'coders/tim2.c' || echo '$(srcdir)/'`coders/tim2.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/tim2_la-tim2.Tpo coders/$(DEPDIR)/tim2_la-tim2.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/tim2.c' object='coders/tim2_la-tim2.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_tim2_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/tim2_la-tim2.lo `test -f 'coders/tim2.c' || echo '$(srcdir)/'`coders/tim2.c + coders/ttf_la-ttf.lo: coders/ttf.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/ttf_la-ttf.lo -MD -MP -MF coders/$(DEPDIR)/ttf_la-ttf.Tpo -c -o coders/ttf_la-ttf.lo `test -f 'coders/ttf.c' || echo '$(srcdir)/'`coders/ttf.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/ttf_la-ttf.Tpo coders/$(DEPDIR)/ttf_la-ttf.Plo @@ -12315,6 +12361,7 @@ distclean: distclean-am -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tiff.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tile.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim.Plo + -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-txt.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-uil.Plo @@ -12443,6 +12490,7 @@ distclean: distclean-am -rm -f coders/$(DEPDIR)/tiff_la-psd.Plo -rm -f coders/$(DEPDIR)/tiff_la-tiff.Plo -rm -f coders/$(DEPDIR)/tile_la-tile.Plo + -rm -f coders/$(DEPDIR)/tim2_la-tim2.Plo -rm -f coders/$(DEPDIR)/tim_la-tim.Plo -rm -f coders/$(DEPDIR)/ttf_la-ttf.Plo -rm -f coders/$(DEPDIR)/txt_la-txt.Plo @@ -12792,6 +12840,7 @@ maintainer-clean: maintainer-clean-am -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tiff.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tile.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim.Plo + -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-tim2.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ttf.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-txt.Plo -rm -f coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-uil.Plo @@ -12920,6 +12969,7 @@ maintainer-clean: maintainer-clean-am -rm -f coders/$(DEPDIR)/tiff_la-psd.Plo -rm -f coders/$(DEPDIR)/tiff_la-tiff.Plo -rm -f coders/$(DEPDIR)/tile_la-tile.Plo + -rm -f coders/$(DEPDIR)/tim2_la-tim2.Plo -rm -f coders/$(DEPDIR)/tim_la-tim.Plo -rm -f coders/$(DEPDIR)/ttf_la-ttf.Plo -rm -f coders/$(DEPDIR)/txt_la-txt.Plo diff --git a/coders/pnm.c b/coders/pnm.c index b90193419..8e3a53e10 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -1944,7 +1944,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); (void) SetQuantumEndian(image,quantum_info,MSBEndian); - quantum_info->min_is_white=MagickFalase; + quantum_info->min_is_white=MagickFalse; pixels=GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/configure b/configure index e9af9616a..4a9fdc3bf 100755 --- a/configure +++ b/configure @@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=54 MAGICK_VERSION=7.0.8-54 -MAGICK_GIT_REVISION=15868:b13bbd7aa:20190713 +MAGICK_GIT_REVISION=15871:602ee2c21:20190713 # Substitute library versioning -- 2.40.0