diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index a77908c5e3..058a92fc6f 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -128,6 +128,8 @@ static const char " " " " " " + " " + " " " " " " " " diff --git a/Makefile.in b/Makefile.in index 62e8866531..47b78566f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -533,20 +533,20 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC coders/bgr.h coders/bmp.c coders/bmp.h coders/braille.c \ coders/braille.h coders/bytebuffer-private.h coders/cals.c \ coders/cals.h coders/caption.c coders/caption.h coders/cin.c \ - coders/cin.h coders/cip.c coders/cip.h coders/clipboard.c \ - coders/clipboard.h coders/clip.c coders/clip.h coders/cmyk.c \ - coders/cmyk.h coders/coders.h coders/coders-list.h \ - coders/coders-private.h coders/cube.c coders/cube.h \ - coders/cut.c coders/cut.h coders/dcm.c coders/dcm.h \ - coders/dds.c coders/dds.h coders/debug.c coders/debug.h \ - coders/dib.c coders/dib.h coders/djvu.h coders/dng.c \ - coders/dng.h coders/dot.c coders/dot.h coders/dps.h \ - coders/dpx.c coders/dpx.h coders/emf.h coders/ept.h \ - coders/exr.h coders/farbfeld.c coders/farbfeld.h coders/fax.c \ - coders/fax.h coders/fits.c coders/fits.h coders/fl32.c \ - coders/fl32.h coders/flif.h coders/fpx.h coders/ftxt.h \ - coders/ftxt.c coders/ghostscript-private.h coders/gif.c \ - coders/gif.h coders/gradient.c coders/gradient.h coders/gray.c \ + coders/cin.h coders/cip.c coders/cip.h coders/clipboard.h \ + coders/clip.c coders/clip.h coders/cmyk.c coders/cmyk.h \ + coders/coders.h coders/coders-list.h coders/coders-private.h \ + coders/cube.c coders/cube.h coders/cut.c coders/cut.h \ + coders/dcm.c coders/dcm.h coders/dds.c coders/dds.h \ + coders/debug.c coders/debug.h coders/dib.c coders/dib.h \ + coders/djvu.h coders/dng.c coders/dng.h coders/dot.c \ + coders/dot.h coders/dps.h coders/dpx.c coders/dpx.h \ + coders/emf.h coders/ept.h coders/exr.h coders/farbfeld.c \ + coders/farbfeld.h coders/fax.c coders/fax.h coders/fits.c \ + coders/fits.h coders/fl32.c coders/fl32.h coders/flif.h \ + coders/fpx.h coders/ftxt.h coders/ftxt.c \ + coders/ghostscript-private.h coders/gif.c coders/gif.h \ + coders/gradient.c coders/gradient.h coders/gray.c \ coders/gray.h coders/hald.c coders/hald.h coders/hdr.c \ coders/hdr.h coders/heic.h coders/histogram.c \ coders/histogram.h coders/hrz.c coders/hrz.h coders/html.c \ @@ -597,10 +597,11 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC coders/xwd.h coders/yaml.c coders/yaml.h coders/ycbcr.c \ coders/ycbcr.h coders/yuv.c coders/yuv.h coders/dps.c \ coders/djvu.c coders/dmr.c coders/exr.c coders/flif.c \ - coders/fpx.c coders/emf.c coders/heic.c coders/jbig.c \ - coders/jpeg.c coders/jp2.c coders/jxl.c coders/png.c \ - coders/ept.c coders/tiff.c coders/uhdr.c coders/webp.c \ - coders/wmf.c coders/x.c coders/xwd.c filters/analyze.c + coders/fpx.c coders/clipboard.c coders/emf.c coders/heic.c \ + coders/jbig.c coders/jpeg.c coders/jp2.c coders/jxl.c \ + coders/png.c coders/ept.c coders/tiff.c coders/uhdr.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 \ @@ -702,7 +703,8 @@ am__objects_1 = MagickCore/libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFF @OPENEXR_DELEGATE_TRUE@am__objects_6 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-exr.lo @FLIF_DELEGATE_TRUE@am__objects_7 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-flif.lo @FPX_DELEGATE_TRUE@am__objects_8 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo -@WINGDI32_DELEGATE_TRUE@am__objects_9 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.lo +@WINGDI32_DELEGATE_TRUE@am__objects_9 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo \ +@WINGDI32_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.lo @HEIC_DELEGATE_TRUE@am__objects_10 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-heic.lo @JBIG_DELEGATE_TRUE@am__objects_11 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jbig.lo @JPEG_DELEGATE_TRUE@am__objects_12 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-jpeg.lo @@ -728,7 +730,6 @@ am__objects_21 = coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-caption.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cin.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cip.lo \ - coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.lo \ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cube.lo \ @@ -993,7 +994,6 @@ coders_clip_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $@ @WITH_MODULES_TRUE@am_coders_clip_la_rpath = -rpath $(codersdir) coders_clipboard_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_coders_clipboard_la_OBJECTS = coders/clipboard_la-clipboard.lo coders_clipboard_la_OBJECTS = $(am_coders_clipboard_la_OBJECTS) @@ -1001,7 +1001,8 @@ coders_clipboard_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(coders_clipboard_la_LDFLAGS) \ $(LDFLAGS) -o $@ -@WITH_MODULES_TRUE@am_coders_clipboard_la_rpath = -rpath $(codersdir) +@WINGDI32_DELEGATE_TRUE@@WITH_MODULES_TRUE@am_coders_clipboard_la_rpath = \ +@WINGDI32_DELEGATE_TRUE@@WITH_MODULES_TRUE@ -rpath $(codersdir) coders_cmyk_la_DEPENDENCIES = $(MAGICKCORE_LIBS) am_coders_cmyk_la_OBJECTS = coders/cmyk_la-cmyk.lo coders_cmyk_la_OBJECTS = $(am_coders_cmyk_la_OBJECTS) @@ -3192,6 +3193,7 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +ClipboardDelegate = @ClipboardDelegate@ ConvertDelegate = @ConvertDelegate@ DATA_DIR = @DATA_DIR@ DEFS = @DEFS@ @@ -3774,8 +3776,8 @@ codersdir = $(CODER_PATH) @UHDR_DELEGATE_TRUE@MAGICKCORE_UHDR_SRCS = coders/uhdr.c @WEBP_DELEGATE_TRUE@MAGICKCORE_WEBP_MODULES = coders/webp.la @WEBP_DELEGATE_TRUE@MAGICKCORE_WEBP_SRCS = coders/webp.c -@WINGDI32_DELEGATE_TRUE@MAGICKCORE_GDI32_MODULES = coders/emf.la -@WINGDI32_DELEGATE_TRUE@MAGICKCORE_GDI32_SRCS = coders/emf.c +@WINGDI32_DELEGATE_TRUE@MAGICKCORE_GDI32_MODULES = coders/clipboard.la coders/emf.la +@WINGDI32_DELEGATE_TRUE@MAGICKCORE_GDI32_SRCS = coders/clipboard.c coders/emf.c @WMF_DELEGATE_TRUE@MAGICKCORE_WMF_MODULES = coders/wmf.la @WMF_DELEGATE_TRUE@MAGICKCORE_WMF_SRCS = coders/wmf.c @X11_DELEGATE_TRUE@MAGICKCORE_X11_MODULES = coders/x.la coders/xwd.la @@ -3810,7 +3812,6 @@ MAGICKCORE_CODER_SRCS = \ coders/cin.h \ coders/cip.c \ coders/cip.h \ - coders/clipboard.c \ coders/clipboard.h \ coders/clip.c \ coders/clip.h \ @@ -4237,7 +4238,6 @@ CODERS_NOINST_HDRS = \ @WITH_MODULES_TRUE@ coders/caption.la \ @WITH_MODULES_TRUE@ coders/cin.la \ @WITH_MODULES_TRUE@ coders/cip.la \ -@WITH_MODULES_TRUE@ coders/clipboard.la \ @WITH_MODULES_TRUE@ coders/clip.la \ @WITH_MODULES_TRUE@ coders/cmyk.la \ @WITH_MODULES_TRUE@ coders/cube.la \ @@ -4448,7 +4448,7 @@ coders_clip_la_LIBADD = $(MAGICKCORE_LIBS) coders_clipboard_la_SOURCES = coders/clipboard.c coders_clipboard_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_clipboard_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_clipboard_la_LIBADD = $(MAGICKCORE_LIBS) $(GDI32_LIBS) $(XEXT_LIBS) $(X11_LIBS) +coders_clipboard_la_LIBADD = $(MAGICKCORE_LIBS) $(GDI32_LIBS) # CMYK coder module coders_cmyk_la_SOURCES = coders/cmyk.c @@ -6964,8 +6964,6 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ci coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cip.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) -coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo: \ - coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-cmyk.lo: \ @@ -7196,6 +7194,8 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fl coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fpx.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo: \ + coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.lo: \ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp) coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-heic.lo: \ @@ -9498,13 +9498,6 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ci @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-cip.lo `test -f 'coders/cip.c' || echo '$(srcdir)/'`coders/cip.c -coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo: coders/clipboard.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-clipboard.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/clipboard.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.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-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c - coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.lo: coders/clip.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-clip.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.lo `test -f 'coders/clip.c' || echo '$(srcdir)/'`coders/clip.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clip.Plo @@ -10310,6 +10303,13 @@ coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-fp @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-fpx.lo `test -f 'coders/fpx.c' || echo '$(srcdir)/'`coders/fpx.c +coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo: coders/clipboard.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-clipboard.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coders/clipboard.c' object='coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-clipboard.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-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c + coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.lo: coders/emf.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-emf.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.Tpo -c -o coders/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.lo `test -f 'coders/emf.c' || echo '$(srcdir)/'`coders/emf.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-emf.Plo diff --git a/coders/Makefile.am b/coders/Makefile.am index b45ff3a9a9..179a94fa8c 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -93,8 +93,8 @@ MAGICKCORE_WEBP_SRCS = coders/webp.c endif if WINGDI32_DELEGATE -MAGICKCORE_GDI32_MODULES = coders/emf.la -MAGICKCORE_GDI32_SRCS = coders/emf.c +MAGICKCORE_GDI32_MODULES = coders/clipboard.la coders/emf.la +MAGICKCORE_GDI32_SRCS = coders/clipboard.c coders/emf.c endif if WMF_DELEGATE @@ -137,7 +137,6 @@ MAGICKCORE_CODER_SRCS = \ coders/cin.h \ coders/cip.c \ coders/cip.h \ - coders/clipboard.c \ coders/clipboard.h \ coders/clip.c \ coders/clip.h \ @@ -564,7 +563,6 @@ coders_LTLIBRARIES = \ coders/caption.la \ coders/cin.la \ coders/cip.la \ - coders/clipboard.la \ coders/clip.la \ coders/cmyk.la \ coders/cube.la \ @@ -777,7 +775,7 @@ coders_clip_la_LIBADD = $(MAGICKCORE_LIBS) coders_clipboard_la_SOURCES= coders/clipboard.c coders_clipboard_la_CPPFLAGS= $(MAGICK_CODER_CPPFLAGS) coders_clipboard_la_LDFLAGS= $(MODULECOMMONFLAGS) -coders_clipboard_la_LIBADD = $(MAGICKCORE_LIBS) $(GDI32_LIBS) $(XEXT_LIBS) $(X11_LIBS) +coders_clipboard_la_LIBADD = $(MAGICKCORE_LIBS) $(GDI32_LIBS) # CMYK coder module coders_cmyk_la_SOURCES = coders/cmyk.c diff --git a/coders/clipboard.c b/coders/clipboard.c index 828b4741f1..afb1f6d73f 100644 --- a/coders/clipboard.c +++ b/coders/clipboard.c @@ -17,7 +17,7 @@ % May 2002 % % % % % -% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 2002 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 % @@ -71,8 +71,10 @@ /* Forward declarations. */ +#if defined(MAGICKCORE_WINGDI32_DELEGATE) static MagickBooleanType WriteCLIPBOARDImage(const ImageInfo *,Image *,ExceptionInfo *); +#endif /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -203,6 +205,7 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info, read_info=DestroyImageInfo(read_info); clip_data=RelinquishMagickMemory(clip_data); return(image); +<<<<<<< HEAD #else /* MAGICKCORE_WINGDI32_DELEGATE */ static Image *ReadCLIPBOARDImage(const ImageInfo *magick_unused(image_info), ExceptionInfo *magick_unused(exception)) @@ -211,7 +214,10 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *magick_unused(image_info), magick_unreferenced(exception); return((Image *) NULL); #endif +======= +>>>>>>> 42c884571 (support clipboard delegate) } +#endif /* MAGICKCORE_WINGDI32_DELEGATE */ /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -242,8 +248,10 @@ ModuleExport size_t RegisterCLIPBOARDImage(void) *entry; entry=AcquireMagickInfo("CLIPBOARD","CLIPBOARD","The system clipboard"); +#if defined(MAGICKCORE_WINGDI32_DELEGATE) entry->decoder=(DecodeImageHandler *) ReadCLIPBOARDImage; entry->encoder=(EncodeImageHandler *) WriteCLIPBOARDImage; +#endif entry->flags^=CoderAdjoinFlag; entry->format_type=ImplicitFormatType; (void) RegisterMagickInfo(entry); @@ -369,6 +377,7 @@ static MagickBooleanType WriteCLIPBOARDImage(const ImageInfo *image_info, else SetClipboardData(CF_DIBV5,clip_handle); (void) CloseClipboard(); +<<<<<<< HEAD #else static MagickBooleanType WriteCLIPBOARDImage( const ImageInfo *magick_unused(image_info), @@ -378,5 +387,8 @@ static MagickBooleanType WriteCLIPBOARDImage( magick_unreferenced(image); magick_unreferenced(exception); #endif /* MAGICKCORE_WINGDI32_DELEGATE */ +======= +>>>>>>> 42c884571 (support clipboard delegate) return(MagickTrue); } +#endif /* MAGICKCORE_WINGDI32_DELEGATE */ diff --git a/config/delegates.xml.in b/config/delegates.xml.in index aed01948ac..1c8a11853c 100644 --- a/config/delegates.xml.in +++ b/config/delegates.xml.in @@ -92,6 +92,8 @@ + + diff --git a/configure b/configure index 8753f4ec7c..4c6357c341 100755 --- a/configure +++ b/configure @@ -751,6 +751,7 @@ ConvertDelegate DVIDecodeDelegate DOCDecodeDelegate DNGDecodeDelegate +ClipboardDelegate BrowseDelegate BlenderDecodeDelegate BPGEncodeDelegate @@ -5197,7 +5198,7 @@ MAGICK_PATCHLEVEL_VERSION=38 MAGICK_VERSION=7.1.1-38 -MAGICK_GIT_REVISION=18377f96e:20240828 +MAGICK_GIT_REVISION=c36fdf0ab:20240829 # Substitute library versioning @@ -5231,7 +5232,7 @@ PACKAGE_LIB_VERSION=0x711 PACKAGE_LIB_VERSION_NUMBER=7,1,1,38 -PACKAGE_RELEASE_DATE=2024-08-28 +PACKAGE_RELEASE_DATE=2024-08-29 # Ensure that make can run correctly @@ -35131,6 +35132,7 @@ BPGDecodeDelegateDefault='bpgdec' BPGEncodeDelegateDefault='bpgenc' BlenderDecodeDelegateDefault='blender' BrowseDelegateDefault='xdg-open' +ClipboardDelegateDefault='xclip' DNGDecodeDelegateDefault='darktable-cli' DOCDecodeDelegateDefault='libreoffice' GVCDecodeDelegateDefault='dot' @@ -35311,7 +35313,7 @@ printf "%s\n" "no" >&6; } fi -for ac_prog in "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx +for ac_prog in "$BrowseDelegateDefault" brave-browser microsoft-edge google-chrome firefox konqueror lynx do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -35362,6 +35364,57 @@ fi done test -n "$BrowseDelegate" || BrowseDelegate=""$BrowseDelegateDefault"" +for ac_prog in "$ClipboardDelegateDefault" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ClipboardDelegate+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ClipboardDelegate in + [\\/]* | ?:[\\/]*) + ac_cv_path_ClipboardDelegate="$ClipboardDelegate" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ClipboardDelegate="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ClipboardDelegate=$ac_cv_path_ClipboardDelegate +if test -n "$ClipboardDelegate"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ClipboardDelegate" >&5 +printf "%s\n" "$ClipboardDelegate" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ClipboardDelegate" && break +done +test -n "$ClipboardDelegate" || ClipboardDelegate=""$ClipboardDelegateDefault"" + # Extract the first word of ""$DNGDecodeDelegateDefault"", so it can be a program name with args. set dummy "$DNGDecodeDelegateDefault"; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -37234,6 +37287,7 @@ if test "$with_frozenpaths" != 'yes'; then BPGEncodeDelegate="$BPGEncodeDelegateDefault" BlenderDecodeDelegate="$BlenderDecodeDelegateDefault" BrowseDelegate="$BrowseDelegateDefault" + ClipboardDelegate="$ClipboardDelegateDefault" ConvertDelegate="$ConvertDelegateDefault" DisplayDelegate="$DisplayDelegateDefault" DNGDecodeDelegate="$DNGDecodeDelegateDefault" @@ -37299,6 +37353,7 @@ fi + # diff --git a/configure.ac b/configure.ac index 0b855ed861..0d48abb265 100644 --- a/configure.ac +++ b/configure.ac @@ -3294,6 +3294,7 @@ BPGDecodeDelegateDefault='bpgdec' BPGEncodeDelegateDefault='bpgenc' BlenderDecodeDelegateDefault='blender' BrowseDelegateDefault='xdg-open' +ClipboardDelegateDefault='xclip' DNGDecodeDelegateDefault='darktable-cli' DOCDecodeDelegateDefault='libreoffice' GVCDecodeDelegateDefault='dot' @@ -3339,7 +3340,8 @@ XPSDelegateDefault='gxps' AC_PATH_PROG([BPGDecodeDelegate],["$BPGDecodeDelegateDefault"],["$BPGDecodeDelegateDefault"]) AC_PATH_PROG([BPGEncodeDelegate],["$BPGEncodeDelegateDefault"],["$BPGEncodeDelegateDefault"]) AC_PATH_PROG([BlenderDecodeDelegate],["$BlenderDecodeDelegateDefault"],["$BlenderDecodeDelegateDefault"]) -AC_PATH_PROGS([BrowseDelegate],["$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx],["$BrowseDelegateDefault"]) +AC_PATH_PROGS([BrowseDelegate],["$BrowseDelegateDefault" brave-browser microsoft-edge google-chrome firefox konqueror lynx],["$BrowseDelegateDefault"]) +AC_PATH_PROGS([ClipboardDelegate],["$ClipboardDelegateDefault"],["$ClipboardDelegateDefault"]) AC_PATH_PROG([DNGDecodeDelegate],["$DNGDecodeDelegateDefault"],["$DNGDecodeDelegateDefault"]) AC_PATH_PROG([DOCDecodeDelegate],["$DOCDecodeDelegateDefault"],["$DOCDecodeDelegateDefault"]) AC_PATH_PROG([DVIDecodeDelegate],["$DVIDecodeDelegateDefault"],["$DVIDecodeDelegateDefault"]) @@ -3612,6 +3614,7 @@ if test "$with_frozenpaths" != 'yes'; then BPGEncodeDelegate="$BPGEncodeDelegateDefault" BlenderDecodeDelegate="$BlenderDecodeDelegateDefault" BrowseDelegate="$BrowseDelegateDefault" + ClipboardDelegate="$ClipboardDelegateDefault" ConvertDelegate="$ConvertDelegateDefault" DisplayDelegate="$DisplayDelegateDefault" DNGDecodeDelegate="$DNGDecodeDelegateDefault" @@ -3651,6 +3654,7 @@ AC_SUBST([BPGDecodeDelegate]) AC_SUBST([BPGEncodeDelegate]) AC_SUBST([BlenderDecodeDelegate]) AC_SUBST([BrowseDelegate]) +AC_SUBST([ClipboardDelegate]) AC_SUBST([ConvertDelegate]) AC_SUBST([GVCDecodeDelegate]) AC_SUBST([DVIDecodeDelegate])