(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index efc5093209790d711daf2b0caf37e4a5bea6c81a..7aa97dc01282c0d2c31a872b3f667885070d43c1 100644 (file)
--- 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  "18648M"
+#define MagickSVNRevision  "18658:18662M"
 #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-25"
+#define MagickReleaseDate  "2015-05-26"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeLicense  \
   "http://www.imagemagick.org/script/license.php"

diff --git a/Makefile.in b/Makefile.in
index a759d15638bd31c90386d256ee37f3794da318a6..459b46404150cc3a8f0280c42e2a422b78152c74 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1637,7 +1637,8 @@ coders_tiff_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
-am_coders_tiff_la_OBJECTS = coders/coders_tiff_la-tiff.lo
+am_coders_tiff_la_OBJECTS = coders/coders_tiff_la-tiff.lo \
+       coders/coders_tiff_la-psd.lo
 coders_tiff_la_OBJECTS = $(am_coders_tiff_la_OBJECTS)
 coders_tiff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -4008,7 +4009,7 @@ coders_thumbnail_la_LDFLAGS = $(MODULECOMMONFLAGS)
 coders_thumbnail_la_LIBADD = $(MAGICKCORE_LIBS)
 
 # TIFF coder module
-coders_tiff_la_SOURCES = coders/tiff.c coders/psd-private.h
+coders_tiff_la_SOURCES = coders/tiff.c coders/psd.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)
@@ -6696,6 +6697,8 @@ coders/thumbnail.la: $(coders_thumbnail_la_OBJECTS) $(coders_thumbnail_la_DEPEND
        $(AM_V_CCLD)$(coders_thumbnail_la_LINK) $(am_coders_thumbnail_la_rpath) $(coders_thumbnail_la_OBJECTS) $(coders_thumbnail_la_LIBADD) $(LIBS)
 coders/coders_tiff_la-tiff.lo: coders/$(am__dirstamp) \
        coders/$(DEPDIR)/$(am__dirstamp)
+coders/coders_tiff_la-psd.lo: coders/$(am__dirstamp) \
+       coders/$(DEPDIR)/$(am__dirstamp)
 
 coders/tiff.la: $(coders_tiff_la_OBJECTS) $(coders_tiff_la_DEPENDENCIES) $(EXTRA_coders_tiff_la_DEPENDENCIES) coders/$(am__dirstamp)
        $(AM_V_CCLD)$(coders_tiff_la_LINK) $(am_coders_tiff_la_rpath) $(coders_tiff_la_OBJECTS) $(coders_tiff_la_LIBADD) $(LIBS)
@@ -7590,6 +7593,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_svg_la-svg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_tga_la-tga.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_thumbnail_la-thumbnail.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_tiff_la-psd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_tiff_la-tiff.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_tile_la-tile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_tim_la-tim.Plo@am__quote@
@@ -10086,6 +10090,13 @@ coders/coders_tiff_la-tiff.lo: coders/tiff.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_tiff_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_tiff_la-tiff.lo `test -f 'coders/tiff.c' || echo '$(srcdir)/'`coders/tiff.c
 
+coders/coders_tiff_la-psd.lo: coders/psd.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_tiff_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_tiff_la-psd.lo -MD -MP -MF coders/$(DEPDIR)/coders_tiff_la-psd.Tpo -c -o coders/coders_tiff_la-psd.lo `test -f 'coders/psd.c' || echo '$(srcdir)/'`coders/psd.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_tiff_la-psd.Tpo coders/$(DEPDIR)/coders_tiff_la-psd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='coders/psd.c' object='coders/coders_tiff_la-psd.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_tiff_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/coders_tiff_la-psd.lo `test -f 'coders/psd.c' || echo '$(srcdir)/'`coders/psd.c
+
 coders/coders_tile_la-tile.lo: coders/tile.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_tile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_tile_la-tile.lo -MD -MP -MF coders/$(DEPDIR)/coders_tile_la-tile.Tpo -c -o coders/coders_tile_la-tile.lo `test -f 'coders/tile.c' || echo '$(srcdir)/'`coders/tile.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_tile_la-tile.Tpo coders/$(DEPDIR)/coders_tile_la-tile.Plo

diff --git a/coders/Makefile.am b/coders/Makefile.am
index bb1511086e03c677565acebb3b57556d7061794b..1ab8312b70a122e28e91784227e7ee3b8217b353 100644 (file)
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -379,7 +379,7 @@ coders_braille_la_LDFLAGS  = $(MODULECOMMONFLAGS)
 coders_braille_la_LIBADD   = $(MAGICKCORE_LIBS)
 
 # CALS coder module
-coders_cals_la_SOURCES    = coders/cals.c
+coders_cals_la_SOURCES     = coders/cals.c
 coders_cals_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
 coders_cals_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_cals_la_LIBADD      = $(MAGICKCORE_LIBS) $(MATH_LIBS)
@@ -439,10 +439,10 @@ coders_dds_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_dds_la_LIBADD       = $(MAGICKCORE_LIBS)
 
 # DEBUG coder module
-coders_debug_la_SOURCES      = coders/debug.c
-coders_debug_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
-coders_debug_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_debug_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_debug_la_SOURCES    = coders/debug.c
+coders_debug_la_CPPFLAGS   = $(MAGICK_CODER_CPPFLAGS)
+coders_debug_la_LDFLAGS    = $(MODULECOMMONFLAGS)
+coders_debug_la_LIBADD     = $(MAGICKCORE_LIBS)
 
 # DIB coder module
 coders_dib_la_SOURCES      = coders/dib.c
@@ -505,10 +505,10 @@ coders_fax_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_fax_la_LIBADD       = $(MAGICKCORE_LIBS)
 
 # FD coder module
-coders_fd_la_SOURCES      = coders/fd.c
-coders_fd_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
-coders_fd_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_fd_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_fd_la_SOURCES       = coders/fd.c
+coders_fd_la_CPPFLAGS      = $(MAGICK_CODER_CPPFLAGS)
+coders_fd_la_LDFLAGS       = $(MODULECOMMONFLAGS)
+coders_fd_la_LIBADD        = $(MAGICKCORE_LIBS)
 
 # FITS coder module
 coders_fits_la_SOURCES     = coders/fits.c
@@ -553,10 +553,10 @@ coders_hald_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_hald_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS)
 
 # HDR coder module
-coders_hdr_la_SOURCES     = coders/hdr.c
-coders_hdr_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
-coders_hdr_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_hdr_la_LIBADD      = $(MAGICKCORE_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
+coders_hdr_la_SOURCES      = coders/hdr.c
+coders_hdr_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+coders_hdr_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+coders_hdr_la_LIBADD       = $(MAGICKCORE_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
 
 # HRZ coder module
 coders_hrz_la_SOURCES      = coders/hrz.c
@@ -583,16 +583,16 @@ coders_info_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_info_la_LIBADD      = $(MAGICKCORE_LIBS)
 
 # INLINE coder module
-coders_inline_la_SOURCES      = coders/inline.c
-coders_inline_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
-coders_inline_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_inline_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_inline_la_SOURCES   = coders/inline.c
+coders_inline_la_CPPFLAGS  = $(MAGICK_CODER_CPPFLAGS)
+coders_inline_la_LDFLAGS   = $(MODULECOMMONFLAGS)
+coders_inline_la_LIBADD    = $(MAGICKCORE_LIBS)
 
 # IPL coder module
-coders_ipl_la_SOURCES     = coders/ipl.c
-coders_ipl_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
-coders_ipl_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_ipl_la_LIBADD      = $(MAGICKCORE_LIBS)
+coders_ipl_la_SOURCES      = coders/ipl.c
+coders_ipl_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+coders_ipl_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+coders_ipl_la_LIBADD       = $(MAGICKCORE_LIBS)
 
 # JBIG coder module
 coders_jbig_la_SOURCES     = coders/jbig.c
@@ -613,10 +613,10 @@ coders_jp2_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_jp2_la_LIBADD       = $(MAGICKCORE_LIBS) $(LIBOPENJP2_LIBS) $(MATH_LIBS)
 
 # JNX coder module
-coders_jnx_la_SOURCES     = coders/jnx.c
-coders_jnx_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
-coders_jnx_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_jnx_la_LIBADD      = $(MAGICKCORE_LIBS)
+coders_jnx_la_SOURCES      = coders/jnx.c
+coders_jnx_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
+coders_jnx_la_LDFLAGS      = $(MODULECOMMONFLAGS)
+coders_jnx_la_LIBADD       = $(MAGICKCORE_LIBS)
 
 # JSON coder module
 coders_json_la_SOURCES     = coders/json.c
@@ -649,10 +649,10 @@ coders_map_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_map_la_LIBADD       = $(MAGICKCORE_LIBS)
 
 # MASK coder module
-coders_mask_la_SOURCES    = coders/mask.c
-coders_mask_la_CPPFLAGS   = $(MAGICK_CODER_CPPFLAGS)
-coders_mask_la_LDFLAGS    = $(MODULECOMMONFLAGS)
-coders_mask_la_LIBADD     = $(MAGICKCORE_LIBS)
+coders_mask_la_SOURCES     = coders/mask.c
+coders_mask_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
+coders_mask_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+coders_mask_la_LIBADD      = $(MAGICKCORE_LIBS)
 
 # MAT coder module
 coders_mat_la_SOURCES      = coders/mat.c
@@ -739,16 +739,16 @@ coders_palm_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_palm_la_LIBADD      = $(MAGICKCORE_LIBS)
 
 # PANGO coder module
-coders_pango_la_SOURCES  = coders/pango.c
-coders_pango_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) $(PANGO_CFLAGS)
-coders_pango_la_LDFLAGS  = $(MODULECOMMONFLAGS)
-coders_pango_la_LIBADD   = $(MAGICKCORE_LIBS) $(PANGO_LIBS)
+coders_pango_la_SOURCES    = coders/pango.c
+coders_pango_la_CPPFLAGS   = $(MAGICK_CODER_CPPFLAGS) $(PANGO_CFLAGS)
+coders_pango_la_LDFLAGS    = $(MODULECOMMONFLAGS)
+coders_pango_la_LIBADD     = $(MAGICKCORE_LIBS) $(PANGO_LIBS)
 
 # Pattern module
-coders_pattern_la_SOURCES   = coders/pattern.c
-coders_pattern_la_CPPFLAGS  = $(MAGICK_CODER_CPPFLAGS)
-coders_pattern_la_LDFLAGS   = $(MODULECOMMONFLAGS)
-coders_pattern_la_LIBADD    = $(MAGICKCORE_LIBS)
+coders_pattern_la_SOURCES  = coders/pattern.c
+coders_pattern_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
+coders_pattern_la_LDFLAGS  = $(MODULECOMMONFLAGS)
+coders_pattern_la_LIBADD   = $(MAGICKCORE_LIBS)
 
 # PCD coder module
 coders_pcd_la_SOURCES      = coders/pcd.c
@@ -901,10 +901,10 @@ coders_sgi_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_sgi_la_LIBADD       = $(MAGICKCORE_LIBS)
 
 # SIXEL coder module
-coders_sixel_la_SOURCES      = coders/sixel.c
-coders_sixel_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
-coders_sixel_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_sixel_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_sixel_la_SOURCES    = coders/sixel.c
+coders_sixel_la_CPPFLAGS   = $(MAGICK_CODER_CPPFLAGS)
+coders_sixel_la_LDFLAGS    = $(MODULECOMMONFLAGS)
+coders_sixel_la_LIBADD     = $(MAGICKCORE_LIBS)
 
 # STEGANO coder module
 coders_stegano_la_SOURCES  = coders/stegano.c
@@ -943,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/psd-private.h
+coders_tiff_la_SOURCES     = coders/tiff.c coders/psd.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)
@@ -1021,10 +1021,10 @@ coders_wbmp_la_LDFLAGS     = $(MODULECOMMONFLAGS)
 coders_wbmp_la_LIBADD      = $(MAGICKCORE_LIBS)
 
 # WEBP coder module
-coders_webp_la_SOURCES      = coders/webp.c
-coders_webp_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
-coders_webp_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_webp_la_LIBADD       = $(MAGICKCORE_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
+coders_webp_la_SOURCES     = coders/webp.c
+coders_webp_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
+coders_webp_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+coders_webp_la_LIBADD      = $(MAGICKCORE_LIBS) $(WEBP_LIBS) $(MATH_LIBS)
 
 # WMF coder module
 coders_wmf_la_SOURCES      = coders/wmf.c
@@ -1075,10 +1075,10 @@ coders_xps_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_xps_la_LIBADD       = $(MAGICKCORE_LIBS) $(MUPDF_LIBS) $(FREETYPE_LIBS) $(MATH_LIBS)
 
 # XPS coder module
-coders_xtrn_la_SOURCES      = coders/xtrn.c
-coders_xtrn_la_CPPFLAGS     = $(MAGICK_CODER_CPPFLAGS)
-coders_xtrn_la_LDFLAGS      = $(MODULECOMMONFLAGS)
-coders_xtrn_la_LIBADD       = $(MAGICKCORE_LIBS)
+coders_xtrn_la_SOURCES     = coders/xtrn.c
+coders_xtrn_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
+coders_xtrn_la_LDFLAGS     = $(MODULECOMMONFLAGS)
+coders_xtrn_la_LIBADD      = $(MAGICKCORE_LIBS)
 
 # XWD coder module
 coders_xwd_la_SOURCES      = coders/xwd.c
@@ -1087,10 +1087,10 @@ coders_xwd_la_LDFLAGS      = $(MODULECOMMONFLAGS)
 coders_xwd_la_LIBADD       = $(MAGICKCORE_LIBS) $(X11_LIBS)
 
 # YCBCR coder module
-coders_ycbcr_la_SOURCES     = coders/ycbcr.c
-coders_ycbcr_la_CPPFLAGS    = $(MAGICK_CODER_CPPFLAGS)
-coders_ycbcr_la_LDFLAGS     = $(MODULECOMMONFLAGS)
-coders_ycbcr_la_LIBADD      = $(MAGICKCORE_LIBS)
+coders_ycbcr_la_SOURCES    = coders/ycbcr.c
+coders_ycbcr_la_CPPFLAGS   = $(MAGICK_CODER_CPPFLAGS)
+coders_ycbcr_la_LDFLAGS    = $(MODULECOMMONFLAGS)
+coders_ycbcr_la_LIBADD     = $(MAGICKCORE_LIBS)
 
 # YUV coder module
 coders_yuv_la_SOURCES      = coders/yuv.c

diff --git a/configure b/configure
index 0bc119dfba378fb599f62f5f7c9d00205f78ddc1..f1bfd46bcce9753468314776a5de0c12da7de250 100755 (executable)
--- a/configure
+++ b/configure
@@ -4341,7 +4341,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18648M
+MAGICK_SVN_REVISION=18658:18662M
 
 
 # Substitute library versioning