(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 9f2188eaad5779e5f34ed79220a5d03d57544508..6af4243652c3e8ff3f73d215ba59c81fda8370c4 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -175,7 +175,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/morphology.h \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
-       MagickCore/nt-feature.h \
+       MagickCore/nt-base-private.h \
        MagickCore/option.c \
        MagickCore/option.h \
        MagickCore/paint.c \

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8f502c32a20643a3e4aa359092abc8f8f46be539..a87e762a7bfa68195aa196f8bb0664e933290b69 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5542"
+#define MagickSVNRevision  "5545"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-06"
+#define MagickReleaseDate  "2011-10-07"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index a85a4c0fb5a8cde303e1a2ea5d339d315ed5186f..891966a75c388a982a8f7d6f20e628cdc4630aa4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -427,7 +427,7 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/monitor-private.h MagickCore/montage.c \
        MagickCore/montage.h MagickCore/morphology.c \
        MagickCore/morphology.h MagickCore/morphology-private.h \
-       MagickCore/nt-base.h MagickCore/nt-feature.h \
+       MagickCore/nt-base.h MagickCore/nt-base-private.h \
        MagickCore/option.c MagickCore/option.h MagickCore/paint.c \
        MagickCore/paint.h MagickCore/pixel.c MagickCore/pixel.h \
        MagickCore/pixel-accessor.h MagickCore/policy.c \
@@ -468,37 +468,37 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/widget.h MagickCore/widget-private.h \
        MagickCore/xml-tree.c MagickCore/xml-tree.h \
        MagickCore/xml-tree-private.h MagickCore/xwindow.c \
-       MagickCore/xwindow.h MagickCore/nt-base.c \
-       MagickCore/nt-base-private.h coders/aai.c coders/art.c \
-       coders/avs.c coders/bgr.c coders/bmp.c coders/braille.c \
-       coders/cals.c coders/caption.c coders/cin.c coders/cip.c \
-       coders/clip.c coders/cmyk.c coders/cut.c coders/dcm.c \
-       coders/dds.c coders/debug.c coders/dib.c coders/dng.c \
-       coders/dot.c coders/dpx.c coders/fax.c coders/fits.c \
-       coders/gif.c coders/gradient.c coders/gray.c coders/hald.c \
-       coders/hdr.c coders/histogram.c coders/hrz.c coders/html.c \
-       coders/icon.c coders/info.c coders/inline.c coders/ipl.c \
-       coders/label.c coders/mac.c coders/magick.c coders/map.c \
-       coders/mat.c coders/matte.c coders/meta.c coders/miff.c \
-       coders/mono.c coders/mpc.c coders/mpeg.c coders/mpr.c \
-       coders/msl.c coders/mtv.c coders/mvg.c coders/null.c \
-       coders/otb.c coders/palm.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/preview.c coders/ps.c coders/ps2.c \
-       coders/ps3.c coders/psd.c coders/pwp.c coders/raw.c \
-       coders/rgb.c coders/rla.c coders/rle.c coders/scr.c \
-       coders/sct.c coders/sfw.c coders/sgi.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/wbmp.c coders/wpg.c \
-       coders/xbm.c coders/xc.c coders/xcf.c coders/xpm.c \
-       coders/xps.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
+       MagickCore/xwindow.h MagickCore/nt-base.c coders/aai.c \
+       coders/art.c coders/avs.c coders/bgr.c coders/bmp.c \
+       coders/braille.c coders/cals.c coders/caption.c coders/cin.c \
+       coders/cip.c coders/clip.c coders/cmyk.c coders/cut.c \
+       coders/dcm.c coders/dds.c coders/debug.c coders/dib.c \
+       coders/dng.c coders/dot.c coders/dpx.c coders/fax.c \
+       coders/fits.c coders/gif.c coders/gradient.c coders/gray.c \
+       coders/hald.c coders/hdr.c coders/histogram.c coders/hrz.c \
+       coders/html.c coders/icon.c coders/info.c coders/inline.c \
+       coders/ipl.c coders/label.c coders/mac.c coders/magick.c \
+       coders/map.c coders/mat.c coders/matte.c coders/meta.c \
+       coders/miff.c coders/mono.c coders/mpc.c coders/mpeg.c \
+       coders/mpr.c coders/msl.c coders/mtv.c coders/mvg.c \
+       coders/null.c coders/otb.c coders/palm.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/preview.c coders/ps.c \
+       coders/ps2.c coders/ps3.c coders/psd.c coders/pwp.c \
+       coders/raw.c coders/rgb.c coders/rla.c coders/rle.c \
+       coders/scr.c coders/sct.c coders/sfw.c coders/sgi.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/wbmp.c \
+       coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \
+       coders/xpm.c coders/xps.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_la-accelerate.lo \
        MagickCore/MagickCore_libMagickCore_la-animate.lo \
        MagickCore/MagickCore_libMagickCore_la-annotate.lo \
@@ -3983,7 +3983,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/morphology.h \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
-       MagickCore/nt-feature.h \
+       MagickCore/nt-base-private.h \
        MagickCore/option.c \
        MagickCore/option.h \
        MagickCore/paint.c \

diff --git a/config/configure.xml b/config/configure.xml
index aa21b24dd74beaee4bf0ecb4d213439345c05c16..649b2b39c8b1d4d39f60a4035536a47905213cd5 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5542" />
-  <configure name="RELEASE_DATE" value="2011-10-06"/>
+  <configure name="SVN_REVISION" value="5545" />
+  <configure name="RELEASE_DATE" value="2011-10-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index ae64eccd22d58559f0d59b3106eefa777a522a52..6cde133f099038bbba51f7f7ed35608ad71706f5 100755 (executable)
--- a/configure
+++ b/configure
@@ -3584,7 +3584,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=5542
+MAGICK_SVN_REVISION=5545