(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 611da98c1196835668bf41a80a65685e4a055e79..a559a4dc3f28977c6844e6e7fabeb0d39f3cb194 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -176,6 +176,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/morphology.h \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
+  MagickCore/nt-base-private.h \
        MagickCore/nt-feature.h \
        MagickCore/option.c \
        MagickCore/option.h \
@@ -272,6 +273,7 @@ if WIN32_NATIVE_BUILD
 MAGICKCORE_PLATFORM_SRCS = \
   MagickCore/nt-base.c \
   MagickCore/nt-base.h \
+  MagickCore/nt-base-private.h \
   MagickCore/nt-feature.c \
   MagickCore/nt-feature.h
 else

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index b8061855b182cc5242a012f1f0efb9db7b4cb3fa..0b6772b60ecb4918fd8a08aac4e24ce198fe9b76 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -64,7 +64,7 @@
 #include "MagickCore/mime-private.h"
 #include "MagickCore/module.h"
 #include "MagickCore/module-private.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/random-private.h"
 #include "MagickCore/registry.h"
 #include "MagickCore/registry-private.h"

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 1e2ade24d1e869d4a9f5b0b0240de88457fefdf1..87a93c8649e17cf6842c92b100fec165a418846f 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -55,7 +55,7 @@
 #if defined(MAGICKCORE_LTDL_DELEGATE)
 #  include "ltdl.h"
 #endif
-#include "MagickCore/nt-base.h"
+#include "MagickCore/nt-base-private.h"
 #if defined(MAGICKCORE_CIPHER_SUPPORT)
 #include <ntsecapi.h>
 #include <wincrypt.h>

diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 97a2f34a41ad866475fcc693f3d208681a22dbb7..521c6821341f8090a33901c457f344317b2d96b3 100644 (file)
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -1,12 +1,12 @@
 /*
   Copyright 1999-2012 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.
@@ -22,409 +22,28 @@
 extern "C" {
 #endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-
-#include "MagickCore/delegate.h"
-#include "MagickCore/delegate-private.h"
-#include "MagickCore/exception.h"
-
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-#define _CRT_SECURE_NO_DEPRECATE  1
-#include <windows.h>
-#include <wchar.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <io.h>
-#include <process.h>
-#include <errno.h>
-#if defined(_DEBUG) && !defined(__MINGW32__)
-#include <crtdbg.h>
-#endif
-
-#define PROT_READ  0x01
-#define PROT_WRITE  0x02
-#define MAP_SHARED  0x01
-#define MAP_PRIVATE  0x02
-#define MAP_ANONYMOUS  0x20
-#define F_OK 0
-#define R_OK 4
-#define W_OK 2
-#define RW_OK 6
-#define _SC_PAGESIZE 1
-#define _SC_PHYS_PAGES 2
-#define _SC_OPEN_MAX 3
-#if !defined(SSIZE_MAX)
-#define SSIZE_MAX  0x7fffffffL
-#endif
-
-/*
-  _MSC_VER values:
-    1100 MSVC 5.0
-    1200 MSVC 6.0
-    1300 MSVC 7.0 Visual C++ .NET 2002
-    1310 Visual c++ .NET 2003
-    1400 Visual C++ 2005
-    1500 Visual C++ 2008
-*/
-
-#if !defined(chsize)
-# if defined(__BORLANDC__)
-#   define chsize(file,length)  chsize(file,length)
-# else
-#   define chsize(file,length)  _chsize(file,length)
-# endif
-#endif
-
-#if !defined(access)
-#if defined(_VISUALC_) && (_MSC_VER >= 1400)
-#  define access(path,mode)  _access_s(path,mode)
-#endif
-#endif
-#if !defined(chdir)
-#  define chdir  _chdir
-#endif
-#if !defined(close)
-#  define close  _close
-#endif
-#if !defined(closedir)
-#  define closedir(directory)  NTCloseDirectory(directory)
-#endif
-#if !defined(fdopen)
-#  define fdopen  _fdopen
-#endif
-#if !defined(fileno)
-#  define fileno  _fileno
-#endif
-#if !defined(fseek) && !defined(__MINGW32__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define fseek  _fseeki64
-#endif
-#endif
-#if !defined(fstat) && !defined(__BORLANDC__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define fstat  _fstati64
-#else
-#  define fstat  _fstat
-#endif
-#endif
-#if !defined(fsync)
-#  define fsync  _commit
-#endif
-#if !defined(ftell) && !defined(__MINGW32__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define ftell  _ftelli64
-#endif
-#endif
-#if !defined(ftruncate)
-#  define ftruncate(file,length)  NTTruncateFile(file,length)
-#endif
-#if !defined(getcwd)
-#  define getcwd  _getcwd
-#endif
-#if !defined(getpid)
-#  define getpid  _getpid
-#endif
-#if !defined(hypot)
-#  define hypot  _hypot
-#endif
-#if !defined(inline)
-#  define inline __inline
-#endif
-#if !defined(isatty)
-#  define isatty _isatty
-#endif
-#if !defined(locale_t)
-#define locale_t _locale_t
-#endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define lseek  _lseeki64
-#else
-#  define lseek  _lseek
-#endif
-#if !defined(MAGICKCORE_LTDL_DELEGATE)
-#if !defined(lt_dlclose)
-#  define lt_dlclose(handle)  NTCloseLibrary(handle)
-#endif
-#if !defined(lt_dlerror)
-#  define lt_dlerror()  NTGetLibraryError()
-#endif
-#if !defined(lt_dlexit)
-#  define lt_dlexit()  NTExitLibrary()
-#endif
-#if !defined(lt_dlinit)
-#  define lt_dlinit()  NTInitializeLibrary()
-#endif
-#if !defined(lt_dlopen)
-#  define lt_dlopen(filename)  NTOpenLibrary(filename)
-#endif
-#if !defined(lt_dlsetsearchpath)
-#  define lt_dlsetsearchpath(path)  NTSetSearchPath(path)
-#endif
-#if !defined(lt_dlsym)
-#  define lt_dlsym(handle,name)  NTGetLibrarySymbol(handle,name)
-#endif
-#endif
-#if !defined(mkdir)
-#  define mkdir  _mkdir
-#endif
-#if !defined(mmap)
-#  define mmap(address,length,protection,access,file,offset) \
-  NTMapMemory(address,length,protection,access,file,offset)
-#endif
-#if !defined(msync)
-#  define msync(address,length,flags)  NTSyncMemory(address,length,flags)
-#endif
-#if !defined(munmap)
-#  define munmap(address,length)  NTUnmapMemory(address,length)
-#endif
-#if !defined(opendir)
-#  define opendir(directory)  NTOpenDirectory(directory)
-#endif
-#if !defined(open)
-#  define open  _open
-#endif
-#if !defined(pclose)
-#  define pclose  _pclose
-#endif
-#if !defined(popen)
-#  define popen  _popen
-#endif
-#if !defined(fprintf_l)
-#define fprintf_l  _fprintf_s_l
-#endif
-#if !defined(read)
-#  define read  _read
-#endif
-#if !defined(readdir)
-#  define readdir(directory)  NTReadDirectory(directory)
-#endif
-#if !defined(seekdir)
-#  define seekdir(directory,offset)  NTSeekDirectory(directory,offset)
-#endif
-#if !defined(setmode)
-#  define setmode  _setmode
-#endif
-#if !defined(spawnvp)
-#  define spawnvp  _spawnvp
-#endif
-#if !defined(strtod_l)
-#define strtod_l  _strtod_l
-#endif
-#if !defined(stat) && !defined(__BORLANDC__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define stat  _stati64
-#else
-#  define stat  _stat
-#endif
-#endif
-#if !defined(strcasecmp)
-#  define strcasecmp  _strcmpi
-#endif
-#if !defined(strncasecmp)
-#  define strncasecmp  _strnicmp
-#endif
-#if !defined(sysconf)
-#  define sysconf(name)  NTSystemConfiguration(name)
-#endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define tell  _telli64
-#else
-#  define tell  _tell
-#endif
-#if !defined(telldir)
-#  define telldir(directory)  NTTellDirectory(directory)
-#endif
-#if !defined(tempnam)
-#  define tempnam  _tempnam_s
-#endif
-#if !defined(vfprintf_l)
-#define vfprintf_l  _vfprintf_l
-#endif
-#if !defined(vsnprintf)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1500)
-#define vsnprintf _vsnprintf 
-#endif
-#endif
-#if !defined(vsnprintf_l)
-#define vsnprintf_l  _vsnprintf_l
-#endif
-#if !defined(write)
-#  define write  _write
-#endif
-#if !defined(wstat) && !defined(__BORLANDC__)
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
-  !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
-#  define wstat  _wstati64
-#else
-#  define wstat  _wstat
-#endif
-#endif
-
-#if defined(_MT) && defined(MAGICKCORE_WINDOWS_SUPPORT)
-#  define SAFE_GLOBAL  __declspec(thread)
-#else
-#  define SAFE_GLOBAL
-#endif
-
-#if defined(__BORLANDC__)
-#undef _O_RANDOM
-#define _O_RANDOM 0
-#undef _O_SEQUENTIAL
-#define _O_SEQUENTIAL 0
-#undef _O_SHORT_LIVED
-#define _O_SHORT_LIVED 0
-#undef _O_TEMPORARY
-#define _O_TEMPORARY 0
-#endif
-
-#if !defined(XS_VERSION)
-struct dirent
-{
-  char
-    d_name[2048];
-
-  int
-    d_namlen;
-};
-
-typedef struct _DIR
-{
-  HANDLE
-    hSearch;
-
-  WIN32_FIND_DATA
-    Win32FindData;
+#include "MagickCore/geometry.h"
 
-  BOOL
-    firsttime;
-
-  struct dirent
-    file_info;
-} DIR;
-
-typedef struct _NTMEMORYSTATUSEX
-{
-  DWORD
-    dwLength,
-    dwMemoryLoad;
-
-  DWORDLONG
-    ullTotalPhys,
-    ullAvailPhys,
-    ullTotalPageFile,
-    ullAvailPageFile,
-    ullTotalVirtual,
-    ullAvailVirtual,
-    ullAvailExtendedVirtual;
-} NTMEMORYSTATUSEX;
-
-#if !defined(__MINGW32__)
-struct timezone
-{
-  int
-    tz_minuteswest,
-    tz_dsttime;
-};
-#endif
-
-typedef UINT
-  (CALLBACK *LPFNDLLFUNC1)(DWORD,UINT);
-
-typedef UINT
-  (CALLBACK *LPFNDLLFUNC2)(NTMEMORYSTATUSEX *);
-
-#endif
-
-#if defined(MAGICKCORE_BZLIB_DELEGATE)
-#  if defined(_WIN32)
-#    define BZ_IMPORT 1
-#  endif
-#endif
+#if defined(MAGICKCORE_WINDOWS_SUPPORT)
+typedef struct _GhostInfo
+  GhostInfo_;
 
 extern MagickExport char
-  *NTGetLastError(void),
   **NTArgvToUTF8(const int argc,wchar_t **);
 
-extern MagickExport const GhostInfo
+extern MagickExport const GhostInfo_
   *NTGhostscriptDLLVectors(void);
 
-#if !defined(MAGICKCORE_LTDL_DELEGATE)
-extern MagickExport const char
-  *NTGetLibraryError(void);
-#endif
-
-#if !defined(XS_VERSION)
-extern MagickExport const char
-  *NTGetLibraryError(void);
-
-extern MagickExport DIR
-  *NTOpenDirectory(const char *);
-
-extern MagickExport double
-  NTElapsedTime(void),
-  NTUserTime(void);
-
 extern MagickExport int
-  Exit(int),
-#if !defined(__MINGW32__)
-  gettimeofday(struct timeval *,struct timezone *),
-#endif
-  IsWindows95(),
-  NTCloseDirectory(DIR *),
-  NTCloseLibrary(void *),
-  NTControlHandler(void),
-  NTExitLibrary(void),
-  NTTruncateFile(int,off_t),
-  NTGhostscriptDLL(char *,int),
-  NTGhostscriptEXE(char *,int),
-  NTGhostscriptFonts(char *,int),
-  NTGhostscriptLoadDLL(void),
-  NTGhostscriptUnLoadDLL(void),
-  NTInitializeLibrary(void),
-  NTSetSearchPath(const char *),
-  NTSyncMemory(void *,size_t,int),
-  NTUnmapMemory(void *,size_t),
-  NTSystemCommand(const char *);
-
-extern MagickExport ssize_t
-  NTSystemConfiguration(int),
-  NTTellDirectory(DIR *);
-
-extern MagickExport MagickBooleanType
-  NTGatherRandomData(const size_t,unsigned char *),
-  NTGetExecutionPath(char *,const size_t),
-  NTGetModulePath(const char *,char *),
-  NTReportEvent(const char *,const MagickBooleanType),
-  NTReportException(const char *,const MagickBooleanType);
-
-extern MagickExport struct dirent
-  *NTReadDirectory(DIR *);
-
-extern MagickExport unsigned char
-  *NTRegistryKeyLookup(const char *),
-  *NTResourceToBlob(const char *);
+  NTGhostscriptUnLoadDLL(void);
 
 extern MagickExport void
   NTErrorHandler(const ExceptionType,const char *,const char *),
-  *NTGetLibrarySymbol(void *,const char *),
-  *NTMapMemory(char *,size_t,int,int,int,MagickOffsetType),
-  *NTOpenLibrary(const char *),
-  NTSeekDirectory(DIR *,ssize_t),
   NTWarningHandler(const ExceptionType,const char *,const char *);
-
-#endif /* !XS_VERSION */
-
-#endif /* MAGICK_WINDOWS_SUPPORT */
+#endif
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
-#endif /* !C++ */
+#endif
 
-#endif /* !_MAGICKCORE_NT_BASE_H */
+#endif

diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c
index 69b87ad68729d62143d549a7ef3a92f96354f817..845a67b689e7d4110338bc6a464035dfc98afa37 100644 (file)
--- a/MagickCore/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -61,7 +61,7 @@
 #include "MagickCore/token.h"
 #include "MagickCore/splay-tree.h"
 #include "MagickCore/utility.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index bfb31a37190cb926c7b8e7b464ace04a93f2f433..024de5c5437f5f8bcd93b6d6808cde2323b27417 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -66,7 +66,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantum.h"
 #include "MagickCore/resource_.h"

diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index 1ff1f5ee5538657540d8edf73825e6df1ea83bfd..57705e63c95d38cc1f04a878dd86071affbeb1bd 100644 (file)
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -45,7 +45,7 @@
 #include "MagickCore/exception-private.h"
 #include "MagickCore/log.h"
 #include "MagickCore/memory_.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/timer.h"
 \f
 /*

diff --git a/MagickCore/type.c b/MagickCore/type.c
index c7f2133ff762c15a8638f51bf06fcf585f651c4d..4be03715b6846eaced79beabc00043729f4f5e2d 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -49,7 +49,7 @@
 #include "MagickCore/hashmap.h"
 #include "MagickCore/log.h"
 #include "MagickCore/memory_.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/splay-tree.h"

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index 296cf7ea22b43103eaa9d4cb347ab328e0005701..634a40d816cf9e3665b88919586ed47615e15439 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -50,7 +50,7 @@
 #include "MagickCore/log.h"
 #include "MagickCore/magick-private.h"
 #include "MagickCore/memory_.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/resource_.h"

diff --git a/MagickCore/version.h b/MagickCore/version.h
index a89f92a4097739e31184f80d21234d512fd853ba..d757460a99f2194f21caf81e2b27243d7ec85ea0 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "6913"
+#define MagickSVNRevision  "6934"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-02-20"
+#define MagickReleaseDate  "2012-02-21"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 8557967c83eaef597ae24aa84ef7bde61414af23..99bad6718778e5754f0012b11d6c2e210e009f49 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -64,7 +64,7 @@
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/monitor.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/PreRvIcccm.h"

diff --git a/MagickWand/animate.c b/MagickWand/animate.c
index f211c8d4dcc9d640bbabb454ec11c41db36628b9..ad20b5229ca4e04cd5afcf977afa67eb1d3e833d 100644 (file)
--- a/MagickWand/animate.c
+++ b/MagickWand/animate.c
@@ -44,7 +44,7 @@
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
 #include "MagickCore/animate-private.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/xwindow-private.h"
 \f

diff --git a/MagickWand/display.c b/MagickWand/display.c
index d556f89d22b0bb6b856334ab21d2aed01fa4e03b..efac20d04c3176d00d0e9f78bc79a9eccbece7d0 100644 (file)
--- a/MagickWand/display.c
+++ b/MagickWand/display.c
@@ -45,7 +45,7 @@
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
 #include "MagickCore/display-private.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/xwindow-private.h"
 \f

diff --git a/Makefile.in b/Makefile.in
index 9401d40091c13e098fd6402ccb34b01dd3f7ef21..d95c9a03b5084bf9cc8ae6e679dce519cbd4dc4f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -434,9 +434,9 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        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/option.c \
-       MagickCore/option.h MagickCore/paint.c MagickCore/paint.h \
-       MagickCore/pixel.c MagickCore/pixel.h \
+       MagickCore/nt-base-private.h MagickCore/nt-feature.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 \
        MagickCore/policy.h MagickCore/PreRvIcccm.c \
        MagickCore/PreRvIcccm.h MagickCore/prepress.c \
@@ -4058,6 +4058,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/morphology.h \
        MagickCore/morphology-private.h \
        MagickCore/nt-base.h \
+  MagickCore/nt-base-private.h \
        MagickCore/nt-feature.h \
        MagickCore/option.c \
        MagickCore/option.h \
@@ -4158,6 +4159,7 @@ MAGICKCORE_BASE_SRCS = \
 @WIN32_NATIVE_BUILD_TRUE@MAGICKCORE_PLATFORM_SRCS = \
 @WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-base.c \
 @WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-base.h \
+@WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-base-private.h \
 @WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-feature.c \
 @WIN32_NATIVE_BUILD_TRUE@  MagickCore/nt-feature.h
 

diff --git a/coders/clipboard.c b/coders/clipboard.c
index bbeabc60702ca313346dfa0cc5d04886f8d31f4f..fa7fe2cdbf09c0aa3c7db6846e0e9ec539aa6f12 100644 (file)
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -58,6 +58,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/nt-feature.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantum-private.h"

diff --git a/coders/icon.c b/coders/icon.c
index 75be2e44a7611ec8b151867463b4cf925641c3c9..63eec997d0f332e4e964307ab6e4d27d36ac69a9 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -56,7 +56,7 @@
 #include "MagickCore/memory_.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantize.h"
 #include "MagickCore/quantum-private.h"

diff --git a/coders/jbig.c b/coders/jbig.c
index db365170436ef3ae1b7e960c0c92bbacbfe56b4b..8b5dce9d0e41485781e5cd659026487f96e23094 100644 (file)
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -58,7 +58,7 @@
 #include "MagickCore/memory_.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
-#include "MagickCore/nt-feature.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantum-private.h"
 #include "MagickCore/static.h"

diff --git a/config/configure.xml b/config/configure.xml
index 3f5e4cb08d19e5029ceb146bdfa8980789e50f01..ae959e3212a1fde1c85ac35277024a703ab1860a 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="6913" />
-  <configure name="RELEASE_DATE" value="2012-02-20"/>
+  <configure name="SVN_REVISION" value="6934" />
+  <configure name="RELEASE_DATE" value="2012-02-21"/>
   <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 5b620f27bcfc3278297346c9a6a39b54187a11f3..c8c3d46bafc5dcd0617e495ce0cdecbc7d7cce0f 100755 (executable)
--- a/configure
+++ b/configure
@@ -3612,7 +3612,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=6913
+MAGICK_SVN_REVISION=6934