(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 16e919e549e758e27e393ffccaf03b7a55ac0571..27f203e49ead85ad23f3a6636ea1354d72a7e6d8 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -280,6 +280,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/utility-private.h \
        MagickCore/version.c \
        MagickCore/version.h \
+       MagickCore/version-private.h \
        MagickCore/vms.h \
        MagickCore/widget.c \
        MagickCore/widget.h \
@@ -464,6 +465,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/token-private.h \
        MagickCore/type-private.h \
        MagickCore/utility-private.h \
+       MagickCore/version-private.h \
        MagickCore/vms.h \
        MagickCore/widget-private.h \
        MagickCore/xml-tree-private.h \

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index c1bebc9c6bcc620c0c8d82627271a9fbc48258b9..6a76f6baffca5a8125e3efab51d2204fc51f30a2 100644 (file)
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -71,6 +71,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/version.h"
+#include "MagickCore/version-private.h"
 #if defined(MAGICKCORE_HAVE_SOCKET)
 #include <netinet/in.h>
 #include <netdb.h>

diff --git a/MagickCore/version-private.h b/MagickCore/version-private.h
new file mode 100644 (file)
index 0000000..a2bb2ea
--- /dev/null
+++ b/MagickCore/version-private.h
@@ -0,0 +1,34 @@
+/*
+  Copyright 1999-2013 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.
+  obtain a copy of the License at
+  
+    http://www.imagemagick.org/script/license.php
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore version private methods.
+*/
+#ifndef _MAGICKCORE_VERSION_PRIVATE_H
+#define _MAGICKCORE_VERSION_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include "MagickCore/string_.h"
+
+extern MagickExport unsigned int
+  GetMagickSignature(const StringInfo *);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/version.h b/MagickCore/version.h
index fe66140cf6af1e8f862220deadd48fb783dfceb9..74b997ac589d4492ce0201bbf1812587c80ffe18 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -22,21 +22,19 @@
 extern "C" {
 #endif
 
-#include "MagickCore/string_.h"
-
 /*
   Define declarations.
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10737:10764M"
+#define MagickSVNRevision  "10921:10939M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  8,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  8
 #define MagickLibMinInterface  8
-#define MagickReleaseDate  "2013-02-05"
+#define MagickReleaseDate  "2013-02-06"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"
@@ -75,9 +73,6 @@ extern MagickExport const char
   *GetMagickReleaseDate(void),
   *GetMagickVersion(size_t *);
 
-extern MagickExport unsigned int
-  GetMagickSignature(const StringInfo *);
-
 extern MagickExport void
   ListMagickVersion(FILE *);
 

diff --git a/MagickCore/version.h.in b/MagickCore/version.h.in
index 22fb960ac7f1f9b764ca097d1d3e3ef0fcb2f893..a715d85800cad5405e7039a5e8ada9a51070b3b4 100644 (file)
--- a/MagickCore/version.h.in
+++ b/MagickCore/version.h.in
@@ -22,8 +22,6 @@
 extern "C" {
 #endif
 
-#include "MagickCore/string_.h"
-
 /*
   Define declarations.
 */
@@ -75,9 +73,6 @@ extern MagickExport const char
   *GetMagickReleaseDate(void),
   *GetMagickVersion(size_t *);
 
-extern MagickExport unsigned int
-  GetMagickSignature(const StringInfo *);
-
 extern MagickExport void
   ListMagickVersion(FILE *);
 

diff --git a/Makefile.in b/Makefile.in
index 2dc0e35003b36e1dec513f43a2cb7283156a4c23..58d3c0b91d002a01ecb40997a837ea1b61924571 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -500,42 +500,42 @@ am__MagickCore_libMagickCore_@MAGICK_ABI_SUFFIX@_la_SOURCES_DIST =  \
        MagickCore/threshold.h MagickCore/type.c MagickCore/type.h \
        MagickCore/utility.c MagickCore/utility.h \
        MagickCore/utility-private.h MagickCore/version.c \
-       MagickCore/version.h MagickCore/vms.h MagickCore/widget.c \
-       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-feature.c \
-       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/fd.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/jnx.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/pango.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/version.h MagickCore/version-private.h \
+       MagickCore/vms.h MagickCore/widget.c 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-feature.c 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/fd.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/jnx.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/pango.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_@MAGICK_ABI_SUFFIX@_la-accelerate.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_ABI_SUFFIX@_la-animate.lo \
        MagickCore/MagickCore_libMagickCore_@MAGICK_ABI_SUFFIX@_la-annotate.lo \
@@ -4256,6 +4256,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/utility-private.h \
        MagickCore/version.c \
        MagickCore/version.h \
+       MagickCore/version-private.h \
        MagickCore/vms.h \
        MagickCore/widget.c \
        MagickCore/widget.h \
@@ -4435,6 +4436,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/token-private.h \
        MagickCore/type-private.h \
        MagickCore/utility-private.h \
+       MagickCore/version-private.h \
        MagickCore/vms.h \
        MagickCore/widget-private.h \
        MagickCore/xml-tree-private.h \

diff --git a/coders/mpc.c b/coders/mpc.c
index 0f0c0d22d30ee1503eb15ea113941bde62eaf2f9..6b23c3a93b53ee953a3dd5fe3572d804de463a05 100644 (file)
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -71,6 +71,7 @@
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/utility.h"
+#include "MagickCore/version-private.h"
 \f
 /*
   Forward declarations.

diff --git a/configure b/configure
index 9c222f659bde691045efd73cebfd56e95a812cb2..361284011bdd30be87013763b84188d6ac79a559 100755 (executable)
--- a/configure
+++ b/configure
@@ -3656,7 +3656,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=10737:10764M
+MAGICK_SVN_REVISION=10921:10939M
 
 
 
@@ -21021,7 +21021,7 @@ cat >>confdefs.h <<_ACEOF
 #define QUANTUM_DEPTH_OBSOLETE_IN_H $QUANTUM_DEPTH
 _ACEOF
 
-MAGICKCORE_PCFLAGS="$MAGICKCORE_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
+MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
 CFLAGS="$CFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
 CPPFLAGS="$CPPFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"