From: cristy Date: Mon, 25 May 2015 13:17:09 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~994 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1825052dd207067a8ca5c638825cab81fc0210f;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index d9edf9fe4..efc509320 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2015 ImageMagick Studio LLC" -#define MagickSVNRevision "18557:18577M" +#define MagickSVNRevision "18648M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 0,0,0 @@ -48,7 +48,7 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 0 #define MagickppLibMinInterface 0 -#define MagickReleaseDate "2015-05-17" +#define MagickReleaseDate "2015-05-25" #define MagickChangeDate "20120427" #define MagickAuthoritativeLicense \ "http://www.imagemagick.org/script/license.php" diff --git a/Makefile.in b/Makefile.in index dc8a64f19..a759d1563 100644 --- a/Makefile.in +++ b/Makefile.in @@ -560,20 +560,20 @@ am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURC 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/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/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/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/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 \ @@ -3227,6 +3227,7 @@ MAGICKCORE_CODER_SRCS = \ coders/ps2.c \ coders/ps3.c \ coders/psd.c \ + coders/psd-private.h \ coders/pwp.c \ coders/raw.c \ coders/rgb.c \ @@ -3905,7 +3906,7 @@ coders_ps3_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PSD coder module -coders_psd_la_SOURCES = coders/psd.c +coders_psd_la_SOURCES = coders/psd.c coders/psd-private.h coders_psd_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_psd_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_psd_la_LIBADD = $(MAGICKCORE_LIBS) @@ -4007,7 +4008,7 @@ coders_thumbnail_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS) # TIFF coder module -coders_tiff_la_SOURCES = coders/tiff.c +coders_tiff_la_SOURCES = coders/tiff.c coders/psd-private.h coders_tiff_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_tiff_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) diff --git a/coders/Makefile.am b/coders/Makefile.am index d3f106751..bb1511086 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -160,6 +160,7 @@ MAGICKCORE_CODER_SRCS = \ coders/ps2.c \ coders/ps3.c \ coders/psd.c \ + coders/psd-private.h \ coders/pwp.c \ coders/raw.c \ coders/rgb.c \ @@ -840,7 +841,7 @@ coders_ps3_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_ps3_la_LIBADD = $(MAGICKCORE_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) # PSD coder module -coders_psd_la_SOURCES = coders/psd.c +coders_psd_la_SOURCES = coders/psd.c coders/psd-private.h coders_psd_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_psd_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_psd_la_LIBADD = $(MAGICKCORE_LIBS) @@ -942,7 +943,7 @@ coders_thumbnail_la_LDFLAGS= $(MODULECOMMONFLAGS) coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS) # TIFF coder module -coders_tiff_la_SOURCES = coders/tiff.c +coders_tiff_la_SOURCES = coders/tiff.c coders/psd-private.h coders_tiff_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_tiff_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_tiff_la_LIBADD = $(MAGICKCORE_LIBS) $(TIFF_LIBS) $(JBIG_LIBS) $(JPEG_LIBS) $(LZMA_LIBS) $(ZLIB_LIBS) $(MATH_LIBS) diff --git a/configure b/configure index 30dae7649..0bc119dfb 100755 --- a/configure +++ b/configure @@ -4341,7 +4341,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=18557:18577M +MAGICK_SVN_REVISION=18648M # Substitute library versioning