From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 20 Feb 2012 16:32:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7836bf507b2e32ad7343056f8af34f3ce65d08a;p=imagemagick

---

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index f03eeb0f0..6020fff26 100644
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -269,10 +269,19 @@ MAGICKCORE_BASE_SRCS = \
 	MagickCore/xwindow.h 
 
 if WIN32_NATIVE_BUILD
-MAGICKCORE_PLATFORM_SRCS = \
-	MagickCore/nt-base.c \
-	MagickCore/nt-base.h \
-	MagickCore/nt-base-private.h
+MAGICK_PLATFORM_SRCS = \
+  magick/nt-base.c \
+  magick/nt-base.h \
+  magick/nt-feature.c \
+  magick/nt-feature.h
+else
+if CYGWIN_BUILD
+MAGICK_PLATFORM_SRCS = \
+  magick/nt-feature.c \
+  magick/nt-feature.h
+else
+MAGICK_PLATFORM_SRCS =
+endif # if CYGWIN_BUILD
 endif # if WIN32_NATIVE_BUILD
 
 MAGICKCORE_INCLUDE_HDRS = \
@@ -440,6 +449,7 @@ MAGICKCORE_EXTRA_DIST = \
 	MagickCore/config.h_vms \
 	MagickCore/mac.c \
 	MagickCore/nt-base.c \
+	MagickCore/nt-featur.c \
 	MagickCore/vms.c \
 	MagickCore/xwdfile.h_vms 
 
diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index aef64e951..49fd67310 100644
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -26,8 +26,8 @@ extern "C" {
 
 extern MagickExport const Quantum
   *GetVirtualPixels(const Image *,const ssize_t,const ssize_t,const size_t,
-    const size_t,ExceptionInfo *),
-  *GetVirtualPixelQueue(const Image *);
+    const size_t,ExceptionInfo *) magick_hot_spot,
+  *GetVirtualPixelQueue(const Image *) magick_hot_spot;
 
 extern MagickExport const void
   *GetVirtualMetacontent(const Image *);
@@ -41,17 +41,17 @@ extern MagickExport MagickBooleanType
     ExceptionInfo *),
   PersistPixelCache(Image *,const char *,const MagickBooleanType,
     MagickOffsetType *,ExceptionInfo *),
-  SyncAuthenticPixels(Image *,ExceptionInfo *);
+  SyncAuthenticPixels(Image *,ExceptionInfo *) magick_hot_spot;
 
 extern MagickExport MagickSizeType
   GetImageExtent(const Image *);
 
 extern MagickExport Quantum
   *GetAuthenticPixels(Image *,const ssize_t,const ssize_t,const size_t,
-    const size_t,ExceptionInfo *),
-  *GetAuthenticPixelQueue(const Image *),
+    const size_t,ExceptionInfo *) magick_hot_spot,
+  *GetAuthenticPixelQueue(const Image *) magick_hot_spot,
   *QueueAuthenticPixels(Image *,const ssize_t,const ssize_t,const size_t,
-    const size_t,ExceptionInfo *);
+    const size_t,ExceptionInfo *) magick_hot_spot;
 
 extern MagickExport void
   *GetAuthenticMetacontent(const Image *);
diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 0b6772b60..b8061855b 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.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 63c0fbf5b..b16c83719 100644
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -38,35 +38,23 @@
 /*
   Include declarations.
 */
-#include "MagickCore/studio.h"
+#include "magick/studio.h"
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#include "MagickCore/client.h"
-#include "MagickCore/cache.h"
-#include "MagickCore/color.h"
-#include "MagickCore/colorspace.h"
-#include "MagickCore/colorspace-private.h"
-#include "MagickCore/exception-private.h"
-#include "MagickCore/image.h"
-#include "MagickCore/locale_.h"
-#include "MagickCore/log.h"
-#include "MagickCore/magick.h"
-#include "MagickCore/memory_.h"
-#include "MagickCore/monitor.h"
-#include "MagickCore/monitor-private.h"
-#include "MagickCore/pixel-accessor.h"
-#include "MagickCore/resource_.h"
-#include "MagickCore/resource-private.h"
-#include "MagickCore/timer.h"
-#include "MagickCore/type.h"
-#include "MagickCore/string_.h"
-#include "MagickCore/token.h"
-#include "MagickCore/utility.h"
-#include "MagickCore/version.h"
+#include "magick/client.h"
+#include "magick/exception-private.h"
+#include "magick/locale_.h"
+#include "magick/log.h"
+#include "magick/magick.h"
+#include "magick/memory_.h"
+#include "magick/resource_.h"
+#include "magick/timer.h"
+#include "magick/string_.h"
+#include "magick/utility.h"
+#include "magick/version.h"
 #if defined(MAGICKCORE_LTDL_DELEGATE)
 #  include "ltdl.h"
 #endif
-#include "MagickCore/nt-base.h"
-#include "MagickCore/nt-base-private.h"
+#include "magick/nt-base.h"
 #if defined(MAGICKCORE_CIPHER_SUPPORT)
 #include <ntsecapi.h>
 #include <wincrypt.h>
@@ -106,171 +94,6 @@ extern "C" BOOL WINAPI
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   C r o p I m a g e T o H B i t m a p                                       %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  CropImageToHBITMAP() extracts a specified region of the image and returns
-%  it as a Windows HBITMAP. While the same functionality can be accomplished by
-%  invoking CropImage() followed by ImageToHBITMAP(), this method is more
-%  efficient since it copies pixels directly to the HBITMAP.
-%
-%  The format of the CropImageToHBITMAP method is:
-%
-%      HBITMAP CropImageToHBITMAP(Image* image,const RectangleInfo *geometry,
-%        ExceptionInfo *exception)
-%
-%  A description of each parameter follows:
-%
-%    o image: the image.
-%
-%    o geometry: Define the region of the image to crop with members
-%      x, y, width, and height.
-%
-%    o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport void *CropImageToHBITMAP(Image *image,
-  const RectangleInfo *geometry,ExceptionInfo *exception)
-{
-#define CropImageTag  "Crop/Image"
-
-  BITMAP
-    bitmap;
-
-  HBITMAP
-    bitmapH;
-
-  HANDLE
-    bitmap_bitsH;
-
-  MagickBooleanType
-    proceed;
-
-  RectangleInfo
-    page;
-
-  register const Quantum
-    *p;
-
-  register RGBQUAD
-    *q;
-
-  RGBQUAD
-    *bitmap_bits;
-
-  ssize_t
-    y;
-
-  /*
-    Check crop geometry.
-  */
-  assert(image != (const Image *) NULL);
-  assert(image->signature == MagickSignature);
-  if (image->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  assert(geometry != (const RectangleInfo *) NULL);
-  assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
-  if (((geometry->x+(ssize_t) geometry->width) < 0) ||
-      ((geometry->y+(ssize_t) geometry->height) < 0) ||
-      (geometry->x >= (ssize_t) image->columns) ||
-      (geometry->y >= (ssize_t) image->rows))
-    ThrowImageException(OptionError,"GeometryDoesNotContainImage");
-  page=(*geometry);
-  if ((page.x+(ssize_t) page.width) > (ssize_t) image->columns)
-    page.width=image->columns-page.x;
-  if ((page.y+(ssize_t) page.height) > (ssize_t) image->rows)
-    page.height=image->rows-page.y;
-  if (page.x < 0)
-    {
-      page.width+=page.x;
-      page.x=0;
-    }
-  if (page.y < 0)
-    {
-      page.height+=page.y;
-      page.y=0;
-    }
-
-  if ((page.width == 0) || (page.height == 0))
-    ThrowImageException(OptionError,"GeometryDimensionsAreZero");
-  /*
-    Initialize crop image attributes.
-  */
-  bitmap.bmType         = 0;
-  bitmap.bmWidth        = (LONG) page.width;
-  bitmap.bmHeight       = (LONG) page.height;
-  bitmap.bmWidthBytes   = bitmap.bmWidth * 4;
-  bitmap.bmPlanes       = 1;
-  bitmap.bmBitsPixel    = 32;
-  bitmap.bmBits         = NULL;
-
-  bitmap_bitsH=(HANDLE) GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE,page.width*
-    page.height*bitmap.bmBitsPixel);
-  if (bitmap_bitsH == NULL)
-    return(NULL);
-  bitmap_bits=(RGBQUAD *) GlobalLock((HGLOBAL) bitmap_bitsH);
-  if ( bitmap.bmBits == NULL )
-    bitmap.bmBits = bitmap_bits;
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    TransformImageColorspace(image,sRGBColorspace,exception);
-  /*
-    Extract crop image.
-  */
-  q=bitmap_bits;
-  for (y=0; y < (ssize_t) page.height; y++)
-  {
-    p=GetVirtualPixels(image,page.x,page.y+y,page.width,1,exception);
-    if (p == (const Quantum *) NULL)
-      break;
-
-#if MAGICKCORE_QUANTUM_DEPTH == 8
-      /* Form of PixelInfo is identical to RGBQUAD when MAGICKCORE_QUANTUM_DEPTH==8 */
-      CopyMagickMemory((void*)q,(const void*)p,page.width*sizeof(PixelInfo));
-      q += page.width;
-
-#else  /* 16 or 32 bit Quantum */
-      {
-        ssize_t
-          x;
-
-        /* Transfer pixels, scaling to Quantum */
-        for( x=(ssize_t) page.width ; x> 0 ; x-- )
-          {
-            q->rgbRed = ScaleQuantumToChar(GetPixelRed(image,p));
-            q->rgbGreen = ScaleQuantumToChar(GetPixelGreen(image,p));
-            q->rgbBlue = ScaleQuantumToChar(GetPixelBlue(image,p));
-            q->rgbReserved = 0;
-            ++q;
-            ++p;
-          }
-      }
-#endif
-    proceed=SetImageProgress(image,CropImageTag,y,page.height);
-    if (proceed == MagickFalse)
-      break;
-  }
-  if (y < (ssize_t) page.height)
-    {
-      GlobalUnlock((HGLOBAL) bitmap_bitsH);
-      GlobalFree((HGLOBAL) bitmap_bitsH);
-      return((void *) NULL);
-    }
-  bitmap.bmBits=bitmap_bits;
-  bitmapH=CreateBitmapIndirect(&bitmap);
-  GlobalUnlock((HGLOBAL) bitmap_bitsH);
-  GlobalFree((HGLOBAL) bitmap_bitsH);
-  return((void *) bitmapH);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 %   D l l M a i n                                                             %
 %                                                                             %
 %                                                                             %
@@ -407,7 +230,7 @@ BOOL WINAPI DllMain(HINSTANCE handle,DWORD reason,LPVOID lpvReserved)
 %      process.
 %
 */
-MagickPrivate int Exit(int status)
+MagickExport int Exit(int status)
 {
   if (IsWindows95())
     TerminateProcess(GetCurrentProcess(),(unsigned int) status);
@@ -440,7 +263,7 @@ MagickPrivate int Exit(int status)
 %    o time_zone: the time zone.
 %
 */
-MagickPrivate int gettimeofday (struct timeval *time_value,
+MagickExport int gettimeofday (struct timeval *time_value,
   struct timezone *time_zone)
 {
 #define EpochFiletime  MagickLLConstant(116444736000000000)
@@ -487,117 +310,6 @@ MagickPrivate int gettimeofday (struct timeval *time_value,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   I m a g e T o H B i t m a p                                               %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  ImageToHBITMAP() creates a Windows HBITMAP from an image.
-%
-%  The format of the ImageToHBITMAP method is:
-%
-%      HBITMAP ImageToHBITMAP(Image *image,ExceptionInfo *exception)
-%
-%  A description of each parameter follows:
-%
-%    o image: the image to convert.
-%
-%    o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception)
-{
-  BITMAP
-    bitmap;
-
-  HANDLE
-    bitmap_bitsH;
-
-  HBITMAP
-    bitmapH;
-
-  register ssize_t
-    x;
-
-  register const Quantum
-    *p;
-
-  register RGBQUAD
-    *q;
-
-  RGBQUAD
-    *bitmap_bits;
-
-  size_t
-    length;
-
-  ssize_t
-    y;
-
-  (void) ResetMagickMemory(&bitmap,0,sizeof(bitmap));
-  bitmap.bmType=0;
-  bitmap.bmWidth=(LONG) image->columns;
-  bitmap.bmHeight=(LONG) image->rows;
-  bitmap.bmWidthBytes=4*bitmap.bmWidth;
-  bitmap.bmPlanes=1;
-  bitmap.bmBitsPixel=32;
-  bitmap.bmBits=NULL;
-  length=bitmap.bmWidthBytes*bitmap.bmHeight;
-  bitmap_bitsH=(HANDLE) GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE,length);
-  if (bitmap_bitsH == NULL)
-    {
-      char
-        *message;
-
-      message=GetExceptionMessage(errno);
-      (void) ThrowMagickException(exception,GetMagickModule(),
-        ResourceLimitError,"MemoryAllocationFailed","`%s'",message);
-      message=DestroyString(message);
-      return(NULL);
-    }
-  bitmap_bits=(RGBQUAD *) GlobalLock((HGLOBAL) bitmap_bitsH);
-  q=bitmap_bits;
-  if (bitmap.bmBits == NULL)
-    bitmap.bmBits=bitmap_bits;
-  (void) TransformImageColorspace(image,sRGBColorspace,exception);
-  for (y=0; y < (ssize_t) image->rows; y++)
-  {
-    p=GetVirtualPixels(image,0,y,image->columns,1,exception);
-    if (p == (const Quantum *) NULL)
-      break;
-    for (x=0; x < (ssize_t) image->columns; x++)
-    {
-      q->rgbRed=ScaleQuantumToChar(GetPixelRed(image,p));
-      q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(image,p));
-      q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(image,p));
-      q->rgbReserved=0;
-      p+=GetPixelChannels(image);
-      q++;
-    }
-  }
-  bitmap.bmBits=bitmap_bits;
-  bitmapH=CreateBitmapIndirect(&bitmap);
-  if (bitmapH == NULL)
-    {
-      char
-        *message;
-
-      message=GetExceptionMessage(errno);
-      (void) ThrowMagickException(exception,GetMagickModule(),
-        ResourceLimitError,"MemoryAllocationFailed","`%s'",message);
-      message=DestroyString(message);
-    }
-  GlobalUnlock((HGLOBAL) bitmap_bitsH);
-  GlobalFree((HGLOBAL) bitmap_bitsH);
-  return((void *) bitmapH);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 %   I s W i n d o w s 9 5                                                     %
 %                                                                             %
 %                                                                             %
@@ -611,7 +323,7 @@ MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception)
 %      int IsWindows95()
 %
 */
-MagickPrivate int IsWindows95(void)
+MagickExport int IsWindows95()
 {
   OSVERSIONINFO
     version_info;
@@ -705,7 +417,7 @@ MagickExport char **NTArgvToUTF8(const int argc,wchar_t **argv)
 %    o entry: Specifies a pointer to a DIR structure.
 %
 */
-MagickPrivate int NTCloseDirectory(DIR *entry)
+MagickExport int NTCloseDirectory(DIR *entry)
 {
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(entry != (DIR *) NULL);
@@ -736,7 +448,7 @@ MagickPrivate int NTCloseDirectory(DIR *entry)
 %    o handle: Specifies a handle to a previously loaded dynamic module.
 %
 */
-MagickPrivate int NTCloseLibrary(void *handle)
+MagickExport int NTCloseLibrary(void *handle)
 {
   if (IsWindows95())
     return(FreeLibrary((HINSTANCE) handle));
@@ -770,7 +482,7 @@ static BOOL ControlHandler(DWORD type)
   return(FALSE);
 }
 
-MagickPrivate int NTControlHandler(void)
+MagickExport int NTControlHandler(void)
 {
   return(SetConsoleCtrlHandler((PHANDLER_ROUTINE) ControlHandler,TRUE));
 }
@@ -794,7 +506,7 @@ MagickPrivate int NTControlHandler(void)
 %      double NTElapsedTime(void)
 %
 */
-MagickPrivate double NTElapsedTime(void)
+MagickExport double NTElapsedTime(void)
 {
   union
   {
@@ -894,7 +606,7 @@ MagickExport void NTErrorHandler(const ExceptionType severity,
 %      int NTExitLibrary(void)
 %
 */
-MagickPrivate int NTExitLibrary(void)
+MagickExport int NTExitLibrary(void)
 {
   return(0);
 }
@@ -924,7 +636,7 @@ MagickPrivate int NTExitLibrary(void)
 %    random: the random data is returned here.
 %
 */
-MagickPrivate MagickBooleanType NTGatherRandomData(const size_t length,
+MagickExport MagickBooleanType NTGatherRandomData(const size_t length,
   unsigned char *random)
 {
 #if defined(MAGICKCORE_CIPHER_SUPPORT) && defined(_MSC_VER) && (_MSC_VER > 1200)
@@ -982,7 +694,7 @@ MagickPrivate MagickBooleanType NTGatherRandomData(const size_t length,
 %    o extent: the maximum extent of the path.
 %
 */
-MagickPrivate MagickBooleanType NTGetExecutionPath(char *path,
+MagickExport MagickBooleanType NTGetExecutionPath(char *path,
   const size_t extent)
 {
   GetModuleFileName(0,path,(DWORD) extent);
@@ -1007,7 +719,7 @@ MagickPrivate MagickBooleanType NTGetExecutionPath(char *path,
 %      char *NTGetLastError(void)
 %
 */
-MagickPrivate char *NTGetLastError(void)
+char *NTGetLastError(void)
 {
   char
     *reason;
@@ -1051,7 +763,7 @@ MagickPrivate char *NTGetLastError(void)
 %      const char *NTGetLibraryError(void)
 %
 */
-MagickPrivate const char *NTGetLibraryError(void)
+MagickExport const char *NTGetLibraryError(void)
 {
   static char
     last_error[MaxTextExtent];
@@ -1127,7 +839,7 @@ void *NTGetLibrarySymbol(void *handle,const char *name)
 %    path: the module path is returned here.
 %
 */
-MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path)
+MagickExport MagickBooleanType NTGetModulePath(const char *module,char *path)
 {
   char
     module_path[MaxTextExtent];
@@ -1153,300 +865,6 @@ MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   N T G e t T y p e L i s t                                                 %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  NTLoadTypeLists() loads a Windows TrueType fonts.
-%
-%  The format of the NTLoadTypeLists method is:
-%
-%      MagickBooleanType NTLoadTypeLists(SplayTreeInfo *type_list)
-%
-%  A description of each parameter follows:
-%
-%    o type_list: A linked list of fonts.
-%
-*/
-MagickPrivate MagickBooleanType NTLoadTypeLists(SplayTreeInfo *type_list,
-  ExceptionInfo *exception)
-{
-  HKEY
-    reg_key = (HKEY) INVALID_HANDLE_VALUE;
-
-  LONG
-    res;
-
-
-  int
-    list_entries = 0;
-
-  char
-    buffer[MaxTextExtent],
-    system_root[MaxTextExtent],
-    font_root[MaxTextExtent];
-
-  DWORD
-    type,
-    system_root_length;
-
-  MagickBooleanType
-    status;
-
-  /*
-    Try to find the right Windows*\CurrentVersion key, the SystemRoot and
-    then the Fonts key
-  */
-  res = RegOpenKeyExA (HKEY_LOCAL_MACHINE,
-    "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &reg_key);
-  if (res == ERROR_SUCCESS) {
-    system_root_length=sizeof(system_root)-1;
-    res = RegQueryValueExA(reg_key,"SystemRoot",NULL, &type,
-      (BYTE*) system_root, &system_root_length);
-  }
-  if (res != ERROR_SUCCESS) {
-    res = RegOpenKeyExA (HKEY_LOCAL_MACHINE,
-      "SOFTWARE\\Microsoft\\Windows\\CurrentVersion", 0, KEY_READ, &reg_key);
-    if (res == ERROR_SUCCESS) {
-      system_root_length=sizeof(system_root)-1;
-      res = RegQueryValueExA(reg_key,"SystemRoot",NULL, &type,
-        (BYTE*)system_root, &system_root_length);
-    }
-  }
-  if (res == ERROR_SUCCESS)
-    res = RegOpenKeyExA (reg_key, "Fonts",0, KEY_READ, &reg_key);
-  if (res != ERROR_SUCCESS)
-    return(MagickFalse);
-  *font_root='\0';
-  (void) CopyMagickString(buffer,system_root,MaxTextExtent);
-  (void) ConcatenateMagickString(buffer,"\\fonts\\arial.ttf",MaxTextExtent);
-  if (IsPathAccessible(buffer) != MagickFalse)
-    {
-      (void) CopyMagickString(font_root,system_root,MaxTextExtent);
-      (void) ConcatenateMagickString(font_root,"\\fonts\\",MaxTextExtent);
-    }
-  else
-    {
-      (void) CopyMagickString(font_root,system_root,MaxTextExtent);
-      (void) ConcatenateMagickString(font_root,"\\",MaxTextExtent);
-    }
-
-  {
-    TypeInfo
-      *type_info;
-
-    DWORD
-      registry_index = 0,
-      type,
-      value_data_size,
-      value_name_length;
-
-    char
-      value_data[MaxTextExtent],
-      value_name[MaxTextExtent];
-
-    res = ERROR_SUCCESS;
-
-    while (res != ERROR_NO_MORE_ITEMS)
-      {
-        char
-          *family_extent,
-          token[MaxTextExtent],
-          *pos,
-          *q;
-
-        value_name_length = sizeof(value_name) - 1;
-        value_data_size = sizeof(value_data) - 1;
-        res = RegEnumValueA ( reg_key, registry_index, value_name,
-          &value_name_length, 0, &type, (BYTE*)value_data, &value_data_size);
-        registry_index++;
-        if (res != ERROR_SUCCESS)
-          continue;
-        if ( (pos = strstr(value_name, " (TrueType)")) == (char*) NULL )
-          continue;
-        *pos='\0'; /* Remove (TrueType) from string */
-
-        type_info=(TypeInfo *) AcquireMagickMemory(sizeof(*type_info));
-        if (type_info == (TypeInfo *) NULL)
-          ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-        (void) ResetMagickMemory(type_info,0,sizeof(TypeInfo));
-
-        type_info->path=ConstantString("Windows Fonts");
-        type_info->signature=MagickSignature;
-
-        /* Name */
-        (void) CopyMagickString(buffer,value_name,MaxTextExtent);
-        for(pos = buffer; *pos != 0 ; pos++)
-          if (*pos == ' ')
-            *pos = '-';
-        type_info->name=ConstantString(buffer);
-
-        /* Fullname */
-        type_info->description=ConstantString(value_name);
-
-        /* Format */
-        type_info->format=ConstantString("truetype");
-
-        /* Glyphs */
-        if (strchr(value_data,'\\') != (char *) NULL)
-          (void) CopyMagickString(buffer,value_data,MaxTextExtent);
-        else
-          {
-            (void) CopyMagickString(buffer,font_root,MaxTextExtent);
-            (void) ConcatenateMagickString(buffer,value_data,MaxTextExtent);
-          }
-
-        LocaleLower(buffer);
-        type_info->glyphs=ConstantString(buffer);
-
-        type_info->stretch=NormalStretch;
-        type_info->style=NormalStyle;
-        type_info->weight=400;
-
-        /* Some fonts are known to require special encodings */
-        if ( (LocaleCompare(type_info->name, "Symbol") == 0 ) ||
-             (LocaleCompare(type_info->name, "Wingdings") == 0 ) ||
-             (LocaleCompare(type_info->name, "Wingdings-2") == 0 ) ||
-             (LocaleCompare(type_info->name, "Wingdings-3") == 0 ) )
-          type_info->encoding=ConstantString("AppleRoman");
-
-        family_extent=value_name;
-
-        for (q=value_name; *q != '\0'; )
-          {
-            GetMagickToken(q,(const char **) &q,token);
-            if (*token == '\0')
-              break;
-
-            if (LocaleCompare(token,"Italic") == 0)
-              {
-                type_info->style=ItalicStyle;
-              }
-
-            else if (LocaleCompare(token,"Oblique") == 0)
-              {
-                type_info->style=ObliqueStyle;
-              }
-
-            else if (LocaleCompare(token,"Bold") == 0)
-              {
-                type_info->weight=700;
-              }
-
-            else if (LocaleCompare(token,"Thin") == 0)
-              {
-                type_info->weight=100;
-              }
-
-            else if ( (LocaleCompare(token,"ExtraLight") == 0) ||
-                      (LocaleCompare(token,"UltraLight") == 0) )
-              {
-                type_info->weight=200;
-              }
-
-            else if (LocaleCompare(token,"Light") == 0)
-              {
-                type_info->weight=300;
-              }
-
-            else if ( (LocaleCompare(token,"Normal") == 0) ||
-                      (LocaleCompare(token,"Regular") == 0) )
-              {
-                type_info->weight=400;
-              }
-
-            else if (LocaleCompare(token,"Medium") == 0)
-              {
-                type_info->weight=500;
-              }
-
-            else if ( (LocaleCompare(token,"SemiBold") == 0) ||
-                      (LocaleCompare(token,"DemiBold") == 0) )
-              {
-                type_info->weight=600;
-              }
-
-            else if ( (LocaleCompare(token,"ExtraBold") == 0) ||
-                      (LocaleCompare(token,"UltraBold") == 0) )
-              {
-                type_info->weight=800;
-              }
-
-            else if ( (LocaleCompare(token,"Heavy") == 0) ||
-                      (LocaleCompare(token,"Black") == 0) )
-              {
-                type_info->weight=900;
-              }
-
-            else if (LocaleCompare(token,"Condensed") == 0)
-              {
-                type_info->stretch = CondensedStretch;
-              }
-
-            else if (LocaleCompare(token,"Expanded") == 0)
-              {
-                type_info->stretch = ExpandedStretch;
-              }
-
-            else if (LocaleCompare(token,"ExtraCondensed") == 0)
-              {
-                type_info->stretch = ExtraCondensedStretch;
-              }
-
-            else if (LocaleCompare(token,"ExtraExpanded") == 0)
-              {
-                type_info->stretch = ExtraExpandedStretch;
-              }
-
-            else if (LocaleCompare(token,"SemiCondensed") == 0)
-              {
-                type_info->stretch = SemiCondensedStretch;
-              }
-
-            else if (LocaleCompare(token,"SemiExpanded") == 0)
-              {
-                type_info->stretch = SemiExpandedStretch;
-              }
-
-            else if (LocaleCompare(token,"UltraCondensed") == 0)
-              {
-                type_info->stretch = UltraCondensedStretch;
-              }
-
-            else if (LocaleCompare(token,"UltraExpanded") == 0)
-              {
-                type_info->stretch = UltraExpandedStretch;
-              }
-
-            else
-              {
-                family_extent=q;
-              }
-          }
-
-        (void) CopyMagickString(buffer,value_name,family_extent-value_name+1);
-        StripString(buffer);
-        type_info->family=ConstantString(buffer);
-
-        list_entries++;
-        status=AddValueToSplayTree(type_list,ConstantString(type_info->name),
-          type_info);
-        if (status == MagickFalse)
-          (void) ThrowMagickException(exception,GetMagickModule(),
-            ResourceLimitError,"MemoryAllocationFailed","`%s'",type_info->name);
-      }
-  }
-  RegCloseKey ( reg_key );
-  return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 %   N T G h o s t s c r i p t D L L                                           %
 %                                                                             %
 %                                                                             %
@@ -1650,7 +1068,7 @@ static int NTGhostscriptGetString(const char *name,char *value,
   return(FALSE);
 }
 
-MagickPrivate int NTGhostscriptDLL(char *path,int length)
+MagickExport int NTGhostscriptDLL(char *path,int length)
 {
   static char
     dll[MaxTextExtent] = { "" };
@@ -1717,7 +1135,7 @@ MagickExport const GhostInfo *NTGhostscriptDLLVectors(void)
 %    o length: length of buffer.
 %
 */
-MagickPrivate int NTGhostscriptEXE(char *path,int length)
+MagickExport int NTGhostscriptEXE(char *path,int length)
 {
   register char
     *p;
@@ -1765,7 +1183,7 @@ MagickPrivate int NTGhostscriptEXE(char *path,int length)
 %    o length: length of the path buffer.
 %
 */
-MagickPrivate int NTGhostscriptFonts(char *path,int length)
+MagickExport int NTGhostscriptFonts(char *path,int length)
 {
   char
     buffer[MaxTextExtent],
@@ -1811,7 +1229,7 @@ MagickPrivate int NTGhostscriptFonts(char *path,int length)
 %      int NTGhostscriptLoadDLL(void)
 %
 */
-MagickPrivate int NTGhostscriptLoadDLL(void)
+MagickExport int NTGhostscriptLoadDLL(void)
 {
   char
     path[MaxTextExtent];
@@ -1891,7 +1309,7 @@ MagickExport int NTGhostscriptUnLoadDLL(void)
 %      int NTInitializeLibrary(void)
 %
 */
-MagickPrivate int NTInitializeLibrary(void)
+MagickExport int NTInitializeLibrary(void)
 {
   return(0);
 }
@@ -1901,42 +1319,6 @@ MagickPrivate int NTInitializeLibrary(void)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   N T I s M a g i c k C o n f l i c t                                       %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  NTIsMagickConflict() returns true if the image format conflicts with a
-%  logical drive (.e.g. X:).
-%
-%  The format of the IsMagickConflict method is:
-%
-%      MagickBooleanType IsMagickConflict(const char *magick)
-%
-%  A description of each parameter follows:
-%
-%    o magick: Specifies the image format.
-%
-*/
-MagickPrivate MagickBooleanType NTIsMagickConflict(const char *magick)
-{
-  MagickBooleanType
-    status;
-
-  assert(magick != (char *) NULL);
-  if (strlen(magick) > 1)
-    return(MagickFalse);
-  status=(GetLogicalDrives() & (1 << ((toupper((int) (*magick)))-'A'))) != 0 ?
-    MagickTrue : MagickFalse;
-  return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 +  N T M a p M e m o r y                                                      %
 %                                                                             %
 %                                                                             %
@@ -1947,11 +1329,11 @@ MagickPrivate MagickBooleanType NTIsMagickConflict(const char *magick)
 %
 %  The format of the NTMapMemory method is:
 %
-%    MagickPrivate void *NTMapMemory(char *address,size_t length,int protection,
+%    MagickExport void *NTMapMemory(char *address,size_t length,int protection,
 %      int access,int file,MagickOffsetType offset)
 %
 */
-MagickPrivate void *NTMapMemory(char *address,size_t length,int protection,
+MagickExport void *NTMapMemory(char *address,size_t length,int protection,
   int flags,int file,MagickOffsetType offset)
 {
   DWORD
@@ -2036,7 +1418,7 @@ MagickPrivate void *NTMapMemory(char *address,size_t length,int protection,
 %    o entry: Specifies a pointer to a DIR structure.
 %
 */
-MagickPrivate DIR *NTOpenDirectory(const char *path)
+MagickExport DIR *NTOpenDirectory(const char *path)
 {
   char
     file_specification[MaxTextExtent];
@@ -2113,7 +1495,7 @@ static const char *GetSearchPath( void )
 #endif
 }
 
-MagickPrivate void *NTOpenLibrary(const char *filename)
+MagickExport void *NTOpenLibrary(const char *filename)
 {
 #define MaxPathElements  31
 
@@ -2194,7 +1576,7 @@ MagickPrivate void *NTOpenLibrary(const char *filename)
 %    o entry: Specifies a pointer to a DIR structure.
 %
 */
-MagickPrivate struct dirent *NTReadDirectory(DIR *entry)
+MagickExport struct dirent *NTReadDirectory(DIR *entry)
 {
   int
     status;
@@ -2236,8 +1618,8 @@ MagickPrivate struct dirent *NTReadDirectory(DIR *entry)
 %  may coexist.
 %
 %  Values are stored in the registry under a base path path similar to
-%  "HKEY_LOCAL_MACHINE/SOFTWARE\ImageMagick\7.0.0\Q:16" or
-%  "HKEY_CURRENT_USER/SOFTWARE\ImageMagick\7.0.0\Q:16". The provided subkey
+%  "HKEY_LOCAL_MACHINE/SOFTWARE\ImageMagick\6.7.4\Q:16" or
+%  "HKEY_CURRENT_USER/SOFTWARE\ImageMagick\6.7.4\Q:16". The provided subkey
 %  is appended to this base path to form the full key.
 %
 %  The format of the NTRegistryKeyLookup method is:
@@ -2251,7 +1633,7 @@ MagickPrivate struct dirent *NTReadDirectory(DIR *entry)
 %      "LibPath", "CoderModulesPath", "FilterModulesPath", "SharePath".
 %
 */
-MagickPrivate unsigned char *NTRegistryKeyLookup(const char *subkey)
+MagickExport unsigned char *NTRegistryKeyLookup(const char *subkey)
 {
   char
     package_key[MaxTextExtent];
@@ -2338,7 +1720,7 @@ MagickPrivate unsigned char *NTRegistryKeyLookup(const char *subkey)
 %    o error: MagickTrue the event is an error.
 %
 */
-MagickPrivate MagickBooleanType NTReportEvent(const char *event,
+MagickExport MagickBooleanType NTReportEvent(const char *event,
   const MagickBooleanType error)
 {
   const char
@@ -2385,7 +1767,7 @@ MagickPrivate MagickBooleanType NTReportEvent(const char *event,
 %    o id: Specifies a string that identifies the resource.
 %
 */
-MagickPrivate unsigned char *NTResourceToBlob(const char *id)
+MagickExport unsigned char *NTResourceToBlob(const char *id)
 {
   char
     path[MaxTextExtent];
@@ -2467,7 +1849,7 @@ MagickPrivate unsigned char *NTResourceToBlob(const char *id)
 %      stream.
 %
 */
-MagickPrivate void NTSeekDirectory(DIR *entry,ssize_t position)
+MagickExport void NTSeekDirectory(DIR *entry,ssize_t position)
 {
   (void) position;
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
@@ -2498,7 +1880,7 @@ MagickPrivate void NTSeekDirectory(DIR *entry,ssize_t position)
 %      for DLL's that can be dynamically loaded.
 %
 */
-MagickPrivate int NTSetSearchPath(const char *path)
+MagickExport int NTSetSearchPath(const char *path)
 {
 #if defined(MAGICKCORE_LTDL_DELEGATE)
   lt_dlsetsearchpath(path);
@@ -2537,7 +1919,7 @@ MagickPrivate int NTSetSearchPath(const char *path)
 %    o flags: Option flags (ignored for Windows).
 %
 */
-MagickPrivate int NTSyncMemory(void *address,size_t length,int flags)
+MagickExport int NTSyncMemory(void *address,size_t length,int flags)
 {
   (void) flags;
   if (FlushViewOfFile(address,length) == MagickFalse)
@@ -2568,7 +1950,7 @@ MagickPrivate int NTSyncMemory(void *address,size_t length,int flags)
 %    o command: This string is the command to execute.
 %
 */
-MagickPrivate int NTSystemCommand(const char *command)
+MagickExport int NTSystemCommand(const char *command)
 {
   char
     local_command[MaxTextExtent];
@@ -2644,7 +2026,7 @@ MagickPrivate int NTSystemCommand(const char *command)
 %    o name: _SC_PAGE_SIZE or _SC_PHYS_PAGES.
 %
 */
-MagickPrivate ssize_t NTSystemConfiguration(int name)
+MagickExport ssize_t NTSystemConfiguration(int name)
 {
   switch (name)
   {
@@ -2719,7 +2101,7 @@ MagickPrivate ssize_t NTSystemConfiguration(int name)
 %    o entry: Specifies a pointer to a DIR structure.
 %
 */
-MagickPrivate ssize_t NTTellDirectory(DIR *entry)
+MagickExport ssize_t NTTellDirectory(DIR *entry)
 {
   assert(entry != (DIR *) NULL);
   return(0);
@@ -2749,7 +2131,7 @@ MagickPrivate ssize_t NTTellDirectory(DIR *entry)
 %    o length: the file length.
 %
 */
-MagickPrivate int NTTruncateFile(int file,off_t length)
+MagickExport int NTTruncateFile(int file,off_t length)
 {
   DWORD
     file_pointer;
@@ -2796,7 +2178,7 @@ MagickPrivate int NTTruncateFile(int file,off_t length)
 %    o length: the length of the binary large object.
 %
 */
-MagickPrivate int NTUnmapMemory(void *map,size_t length)
+MagickExport int NTUnmapMemory(void *map,size_t length)
 {
   (void) length;
   if (UnmapViewOfFile(map) == 0)
@@ -2823,7 +2205,7 @@ MagickPrivate int NTUnmapMemory(void *map,size_t length)
 %      double NTUserTime(void)
 %
 */
-MagickPrivate double NTUserTime(void)
+MagickExport double NTUserTime(void)
 {
   DWORD
     status;
diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index b5dcd2dfd..97a2f34a4 100644
--- 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,30 +22,409 @@
 extern "C" {
 #endif
 
-#include "MagickCore/geometry.h"
-
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-typedef struct _GhostInfo
-  GhostInfo_;
+
+#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;
+
+  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
 
 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
-  NTGhostscriptUnLoadDLL(void);
+  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 *);
 
 extern MagickExport void
-  *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *),
-  *ImageToHBITMAP(Image *,ExceptionInfo *),
   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
+
+#endif /* !XS_VERSION */
+
+#endif /* MAGICK_WINDOWS_SUPPORT */
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
-#endif
+#endif /* !C++ */
 
-#endif
+#endif /* !_MAGICKCORE_NT_BASE_H */
diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c
new file mode 100644
index 000000000..dd1c3a763
--- /dev/null
+++ b/MagickCore/nt-feature.c
@@ -0,0 +1,669 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                                 N   N  TTTTT                                %
+%                                 NN  N    T                                  %
+%                                 N N N    T                                  %
+%                                 N  NN    T                                  %
+%                                 N   N    T                                  %
+%                                                                             %
+%                                                                             %
+%                   Windows NT Feature Methods for MagickCore                 %
+%                                                                             %
+%                               Software Design                               %
+%                                 John Cristy                                 %
+%                                December 1996                                %
+%                                                                             %
+%                                                                             %
+%  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.  You may  %
+%  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.                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+*/
+
+/*
+  Include declarations.
+*/
+#include "magick/studio.h"
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
+#define VC_EXTRALEAN
+#include <windows.h>
+#include "magick/cache.h"
+#include "magick/colorspace.h"
+#include "magick/colorspace-private.h"
+#include "magick/draw.h"
+#include "magick/exception.h"
+#include "magick/exception-private.h"
+#include "magick/image-private.h"
+#include "magick/memory_.h"
+#include "magick/monitor.h"
+#include "magick/monitor-private.h"
+#include "magick/quantum.h"
+#include "magick/string_.h"
+#include "magick/token.h"
+#include "magick/splay-tree.h"
+#include "magick/utility.h"
+#include "magick/nt-feature.h"
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   C r o p I m a g e T o H B i t m a p                                       %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  CropImageToHBITMAP() extracts a specified region of the image and returns
+%  it as a Windows HBITMAP. While the same functionality can be accomplished by
+%  invoking CropImage() followed by ImageToHBITMAP(), this method is more
+%  efficient since it copies pixels directly to the HBITMAP.
+%
+%  The format of the CropImageToHBITMAP method is:
+%
+%      HBITMAP CropImageToHBITMAP(Image* image,const RectangleInfo *geometry,
+%        ExceptionInfo *exception)
+%
+%  A description of each parameter follows:
+%
+%    o image: the image.
+%
+%    o geometry: Define the region of the image to crop with members
+%      x, y, width, and height.
+%
+%    o exception: return any errors or warnings in this structure.
+%
+*/
+MagickExport void *CropImageToHBITMAP(Image *image,
+  const RectangleInfo *geometry,ExceptionInfo *exception)
+{
+#define CropImageTag  "Crop/Image"
+
+  BITMAP
+    bitmap;
+
+  HBITMAP
+    bitmapH;
+
+  HANDLE
+    bitmap_bitsH;
+
+  MagickBooleanType
+    proceed;
+
+  RectangleInfo
+    page;
+
+  register const PixelPacket
+    *p;
+
+  register RGBQUAD
+    *q;
+
+  RGBQUAD
+    *bitmap_bits;
+
+  ssize_t
+    y;
+
+  /*
+    Check crop geometry.
+  */
+  assert(image != (const Image *) NULL);
+  assert(image->signature == MagickSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(geometry != (const RectangleInfo *) NULL);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickSignature);
+  if (((geometry->x+(ssize_t) geometry->width) < 0) ||
+      ((geometry->y+(ssize_t) geometry->height) < 0) ||
+      (geometry->x >= (ssize_t) image->columns) ||
+      (geometry->y >= (ssize_t) image->rows))
+    ThrowImageException(OptionError,"GeometryDoesNotContainImage");
+  page=(*geometry);
+  if ((page.x+(ssize_t) page.width) > (ssize_t) image->columns)
+    page.width=image->columns-page.x;
+  if ((page.y+(ssize_t) page.height) > (ssize_t) image->rows)
+    page.height=image->rows-page.y;
+  if (page.x < 0)
+    {
+      page.width+=page.x;
+      page.x=0;
+    }
+  if (page.y < 0)
+    {
+      page.height+=page.y;
+      page.y=0;
+    }
+
+  if ((page.width == 0) || (page.height == 0))
+    ThrowImageException(OptionError,"GeometryDimensionsAreZero");
+  /*
+    Initialize crop image attributes.
+  */
+  bitmap.bmType         = 0;
+  bitmap.bmWidth        = (LONG) page.width;
+  bitmap.bmHeight       = (LONG) page.height;
+  bitmap.bmWidthBytes   = bitmap.bmWidth * 4;
+  bitmap.bmPlanes       = 1;
+  bitmap.bmBitsPixel    = 32;
+  bitmap.bmBits         = NULL;
+
+  bitmap_bitsH=(HANDLE) GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE,page.width*
+    page.height*bitmap.bmBitsPixel);
+  if (bitmap_bitsH == NULL)
+    return(NULL);
+  bitmap_bits=(RGBQUAD *) GlobalLock((HGLOBAL) bitmap_bitsH);
+  if ( bitmap.bmBits == NULL )
+    bitmap.bmBits = bitmap_bits;
+  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    TransformImageColorspace(image,sRGBColorspace);
+  /*
+    Extract crop image.
+  */
+  q=bitmap_bits;
+  for (y=0; y < (ssize_t) page.height; y++)
+  {
+    p=GetVirtualPixels(image,page.x,page.y+y,page.width,1,exception);
+    if (p == (const PixelPacket *) NULL)
+      break;
+
+#if MAGICKCORE_QUANTUM_DEPTH == 8
+      /* Form of PixelPacket is identical to RGBQUAD when MAGICKCORE_QUANTUM_DEPTH==8 */
+      CopyMagickMemory((void*)q,(const void*)p,page.width*sizeof(PixelPacket));
+      q += page.width;
+
+#else  /* 16 or 32 bit Quantum */
+      {
+        ssize_t
+          x;
+
+        /* Transfer pixels, scaling to Quantum */
+        for( x=(ssize_t) page.width ; x> 0 ; x-- )
+          {
+            q->rgbRed = ScaleQuantumToChar(GetPixelRed(p));
+            q->rgbGreen = ScaleQuantumToChar(GetPixelGreen(p));
+            q->rgbBlue = ScaleQuantumToChar(GetPixelBlue(p));
+            q->rgbReserved = 0;
+            ++q;
+            ++p;
+          }
+      }
+#endif
+    proceed=SetImageProgress(image,CropImageTag,y,page.height);
+    if (proceed == MagickFalse)
+      break;
+  }
+  if (y < (ssize_t) page.height)
+    {
+      GlobalUnlock((HGLOBAL) bitmap_bitsH);
+      GlobalFree((HGLOBAL) bitmap_bitsH);
+      return((void *) NULL);
+    }
+  bitmap.bmBits=bitmap_bits;
+  bitmapH=CreateBitmapIndirect(&bitmap);
+  GlobalUnlock((HGLOBAL) bitmap_bitsH);
+  GlobalFree((HGLOBAL) bitmap_bitsH);
+  return((void *) bitmapH);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   I s M a g i c k C o n f l i c t                                           %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  IsMagickConflict() returns true if the image format conflicts with a logical
+%  drive (.e.g. X:).
+%
+%  The format of the IsMagickConflict method is:
+%
+%      MagickBooleanType IsMagickConflict(const char *magick)
+%
+%  A description of each parameter follows:
+%
+%    o magick: Specifies the image format.
+%
+*/
+MagickExport MagickBooleanType NTIsMagickConflict(const char *magick)
+{
+  MagickBooleanType
+    status;
+
+  assert(magick != (char *) NULL);
+  if (strlen(magick) > 1)
+    return(MagickFalse);
+  status=(GetLogicalDrives() & (1 << ((toupper((int) (*magick)))-'A'))) != 0 ?
+    MagickTrue : MagickFalse;
+  return(status);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
++   N T G e t T y pe L i s t                                                  %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  NTLoadTypeLists() loads a Windows TrueType fonts.
+%
+%  The format of the NTLoadTypeLists method is:
+%
+%      MagickBooleanType NTLoadTypeLists(SplayTreeInfo *type_list)
+%
+%  A description of each parameter follows:
+%
+%    o type_list: A linked list of fonts.
+%
+*/
+MagickExport MagickBooleanType NTLoadTypeLists(SplayTreeInfo *type_list,
+  ExceptionInfo *exception)
+{
+  HKEY
+    reg_key = (HKEY) INVALID_HANDLE_VALUE;
+
+  LONG
+    res;
+
+
+  int
+    list_entries = 0;
+
+  char
+    buffer[MaxTextExtent],
+    system_root[MaxTextExtent],
+    font_root[MaxTextExtent];
+
+  DWORD
+    type,
+    system_root_length;
+
+  MagickBooleanType
+    status;
+
+  /*
+    Try to find the right Windows*\CurrentVersion key, the SystemRoot and
+    then the Fonts key
+  */
+  res = RegOpenKeyExA (HKEY_LOCAL_MACHINE,
+    "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &reg_key);
+  if (res == ERROR_SUCCESS) {
+    system_root_length=sizeof(system_root)-1;
+    res = RegQueryValueExA(reg_key,"SystemRoot",NULL, &type,
+      (BYTE*) system_root, &system_root_length);
+  }
+  if (res != ERROR_SUCCESS) {
+    res = RegOpenKeyExA (HKEY_LOCAL_MACHINE,
+      "SOFTWARE\\Microsoft\\Windows\\CurrentVersion", 0, KEY_READ, &reg_key);
+    if (res == ERROR_SUCCESS) {
+      system_root_length=sizeof(system_root)-1;
+      res = RegQueryValueExA(reg_key,"SystemRoot",NULL, &type,
+        (BYTE*)system_root, &system_root_length);
+    }
+  }
+  if (res == ERROR_SUCCESS)
+    res = RegOpenKeyExA (reg_key, "Fonts",0, KEY_READ, &reg_key);
+  if (res != ERROR_SUCCESS)
+    return(MagickFalse);
+  *font_root='\0';
+  (void) CopyMagickString(buffer,system_root,MaxTextExtent);
+  (void) ConcatenateMagickString(buffer,"\\fonts\\arial.ttf",MaxTextExtent);
+  if (IsPathAccessible(buffer) != MagickFalse)
+    {
+      (void) CopyMagickString(font_root,system_root,MaxTextExtent);
+      (void) ConcatenateMagickString(font_root,"\\fonts\\",MaxTextExtent);
+    }
+  else
+    {
+      (void) CopyMagickString(font_root,system_root,MaxTextExtent);
+      (void) ConcatenateMagickString(font_root,"\\",MaxTextExtent);
+    }
+
+  {
+    TypeInfo
+      *type_info;
+
+    DWORD
+      registry_index = 0,
+      type,
+      value_data_size,
+      value_name_length;
+
+    char
+      value_data[MaxTextExtent],
+      value_name[MaxTextExtent];
+
+    res = ERROR_SUCCESS;
+
+    while (res != ERROR_NO_MORE_ITEMS)
+      {
+        char
+          *family_extent,
+          token[MaxTextExtent],
+          *pos,
+          *q;
+
+        value_name_length = sizeof(value_name) - 1;
+        value_data_size = sizeof(value_data) - 1;
+        res = RegEnumValueA ( reg_key, registry_index, value_name,
+          &value_name_length, 0, &type, (BYTE*)value_data, &value_data_size);
+        registry_index++;
+        if (res != ERROR_SUCCESS)
+          continue;
+        if ( (pos = strstr(value_name, " (TrueType)")) == (char*) NULL )
+          continue;
+        *pos='\0'; /* Remove (TrueType) from string */
+
+        type_info=(TypeInfo *) AcquireMagickMemory(sizeof(*type_info));
+        if (type_info == (TypeInfo *) NULL)
+          ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+        (void) ResetMagickMemory(type_info,0,sizeof(TypeInfo));
+
+        type_info->path=ConstantString("Windows Fonts");
+        type_info->signature=MagickSignature;
+
+        /* Name */
+        (void) CopyMagickString(buffer,value_name,MaxTextExtent);
+        for(pos = buffer; *pos != 0 ; pos++)
+          if (*pos == ' ')
+            *pos = '-';
+        type_info->name=ConstantString(buffer);
+
+        /* Fullname */
+        type_info->description=ConstantString(value_name);
+
+        /* Format */
+        type_info->format=ConstantString("truetype");
+
+        /* Glyphs */
+        if (strchr(value_data,'\\') != (char *) NULL)
+          (void) CopyMagickString(buffer,value_data,MaxTextExtent);
+        else
+          {
+            (void) CopyMagickString(buffer,font_root,MaxTextExtent);
+            (void) ConcatenateMagickString(buffer,value_data,MaxTextExtent);
+          }
+
+        LocaleLower(buffer);
+        type_info->glyphs=ConstantString(buffer);
+
+        type_info->stretch=NormalStretch;
+        type_info->style=NormalStyle;
+        type_info->weight=400;
+
+        /* Some fonts are known to require special encodings */
+        if ( (LocaleCompare(type_info->name, "Symbol") == 0 ) ||
+             (LocaleCompare(type_info->name, "Wingdings") == 0 ) ||
+             (LocaleCompare(type_info->name, "Wingdings-2") == 0 ) ||
+             (LocaleCompare(type_info->name, "Wingdings-3") == 0 ) )
+          type_info->encoding=ConstantString("AppleRoman");
+
+        family_extent=value_name;
+
+        for (q=value_name; *q != '\0'; )
+          {
+            GetMagickToken(q,(const char **) &q,token);
+            if (*token == '\0')
+              break;
+
+            if (LocaleCompare(token,"Italic") == 0)
+              {
+                type_info->style=ItalicStyle;
+              }
+
+            else if (LocaleCompare(token,"Oblique") == 0)
+              {
+                type_info->style=ObliqueStyle;
+              }
+
+            else if (LocaleCompare(token,"Bold") == 0)
+              {
+                type_info->weight=700;
+              }
+
+            else if (LocaleCompare(token,"Thin") == 0)
+              {
+                type_info->weight=100;
+              }
+
+            else if ( (LocaleCompare(token,"ExtraLight") == 0) ||
+                      (LocaleCompare(token,"UltraLight") == 0) )
+              {
+                type_info->weight=200;
+              }
+
+            else if (LocaleCompare(token,"Light") == 0)
+              {
+                type_info->weight=300;
+              }
+
+            else if ( (LocaleCompare(token,"Normal") == 0) ||
+                      (LocaleCompare(token,"Regular") == 0) )
+              {
+                type_info->weight=400;
+              }
+
+            else if (LocaleCompare(token,"Medium") == 0)
+              {
+                type_info->weight=500;
+              }
+
+            else if ( (LocaleCompare(token,"SemiBold") == 0) ||
+                      (LocaleCompare(token,"DemiBold") == 0) )
+              {
+                type_info->weight=600;
+              }
+
+            else if ( (LocaleCompare(token,"ExtraBold") == 0) ||
+                      (LocaleCompare(token,"UltraBold") == 0) )
+              {
+                type_info->weight=800;
+              }
+
+            else if ( (LocaleCompare(token,"Heavy") == 0) ||
+                      (LocaleCompare(token,"Black") == 0) )
+              {
+                type_info->weight=900;
+              }
+
+            else if (LocaleCompare(token,"Condensed") == 0)
+              {
+                type_info->stretch = CondensedStretch;
+              }
+
+            else if (LocaleCompare(token,"Expanded") == 0)
+              {
+                type_info->stretch = ExpandedStretch;
+              }
+
+            else if (LocaleCompare(token,"ExtraCondensed") == 0)
+              {
+                type_info->stretch = ExtraCondensedStretch;
+              }
+
+            else if (LocaleCompare(token,"ExtraExpanded") == 0)
+              {
+                type_info->stretch = ExtraExpandedStretch;
+              }
+
+            else if (LocaleCompare(token,"SemiCondensed") == 0)
+              {
+                type_info->stretch = SemiCondensedStretch;
+              }
+
+            else if (LocaleCompare(token,"SemiExpanded") == 0)
+              {
+                type_info->stretch = SemiExpandedStretch;
+              }
+
+            else if (LocaleCompare(token,"UltraCondensed") == 0)
+              {
+                type_info->stretch = UltraCondensedStretch;
+              }
+
+            else if (LocaleCompare(token,"UltraExpanded") == 0)
+              {
+                type_info->stretch = UltraExpandedStretch;
+              }
+
+            else
+              {
+                family_extent=q;
+              }
+          }
+
+        (void) CopyMagickString(buffer,value_name,family_extent-value_name+1);
+        StripString(buffer);
+        type_info->family=ConstantString(buffer);
+
+        list_entries++;
+        status=AddValueToSplayTree(type_list,ConstantString(type_info->name),
+          type_info);
+        if (status == MagickFalse)
+          (void) ThrowMagickException(exception,GetMagickModule(),
+            ResourceLimitError,"MemoryAllocationFailed","`%s'",type_info->name);
+      }
+  }
+  RegCloseKey ( reg_key );
+  return(MagickTrue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   I m a g e T o H B i t m a p                                               %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  ImageToHBITMAP() creates a Windows HBITMAP from an image.
+%
+%  The format of the ImageToHBITMAP method is:
+%
+%      HBITMAP ImageToHBITMAP(Image *image,Exceptioninfo *exception)
+%
+%  A description of each parameter follows:
+%
+%    o image: the image to convert.
+%
+*/
+MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception)
+{
+  BITMAP
+    bitmap;
+
+  HANDLE
+    bitmap_bitsH;
+
+  HBITMAP
+    bitmapH;
+
+  register ssize_t
+    x;
+
+  register const PixelPacket
+    *p;
+
+  register RGBQUAD
+    *q;
+
+  RGBQUAD
+    *bitmap_bits;
+
+  size_t
+    length;
+
+  ssize_t
+    y;
+
+  (void) ResetMagickMemory(&bitmap,0,sizeof(bitmap));
+  bitmap.bmType=0;
+  bitmap.bmWidth=(LONG) image->columns;
+  bitmap.bmHeight=(LONG) image->rows;
+  bitmap.bmWidthBytes=4*bitmap.bmWidth;
+  bitmap.bmPlanes=1;
+  bitmap.bmBitsPixel=32;
+  bitmap.bmBits=NULL;
+  length=bitmap.bmWidthBytes*bitmap.bmHeight;
+  bitmap_bitsH=(HANDLE) GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE,length);
+  if (bitmap_bitsH == NULL)
+    {
+      char
+        *message;
+
+      message=GetExceptionMessage(errno);
+      (void) ThrowMagickException(exception,GetMagickModule(),
+        ResourceLimitError,"MemoryAllocationFailed","`%s'",message);
+      message=DestroyString(message);
+      return(NULL);
+    }
+  bitmap_bits=(RGBQUAD *) GlobalLock((HGLOBAL) bitmap_bitsH);
+  q=bitmap_bits;
+  if (bitmap.bmBits == NULL)
+    bitmap.bmBits=bitmap_bits;
+  (void) TransformImageColorspace(image,sRGBColorspace);
+  for (y=0; y < (ssize_t) image->rows; y++)
+  {
+    p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+    if (p == (const PixelPacket *) NULL)
+      break;
+    for (x=0; x < (ssize_t) image->columns; x++)
+    {
+      q->rgbRed=ScaleQuantumToChar(GetPixelRed(p));
+      q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(p));
+      q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(p));
+      q->rgbReserved=0;
+      p++;
+      q++;
+    }
+  }
+  bitmap.bmBits=bitmap_bits;
+  bitmapH=CreateBitmapIndirect(&bitmap);
+  if (bitmapH == NULL)
+    {
+      char
+        *message;
+
+      message=GetExceptionMessage(errno);
+      (void) ThrowMagickException(exception,GetMagickModule(),
+        ResourceLimitError,"MemoryAllocationFailed","`%s'",message);
+      message=DestroyString(message);
+    }
+  GlobalUnlock((HGLOBAL) bitmap_bitsH);
+  GlobalFree((HGLOBAL) bitmap_bitsH);
+  return((void *) bitmapH);
+}
+
+#endif
diff --git a/MagickCore/nt-feature.h b/MagickCore/nt-feature.h
new file mode 100644
index 000000000..52592b051
--- /dev/null
+++ b/MagickCore/nt-feature.h
@@ -0,0 +1,43 @@
+/*
+  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.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore Windows NT utility methods.
+*/
+#ifndef _MAGICKCORE_NT_FEATURE_H
+#define _MAGICKCORE_NT_FEATURE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include "MagickCore/splay-tree.h"
+
+extern MagickExport void
+  *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *),
+  *ImageToHBITMAP(Image *,ExceptionInfo *);
+
+#if !defined(XS_VERSION)
+
+extern MagickExport MagickBooleanType
+  NTIsMagickConflict(const char *),
+  NTLoadTypeLists(SplayTreeInfo *,ExceptionInfo *);
+
+#endif
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 024de5c54..bfb31a371 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.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 57705e63c..1ff1f5ee5 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.h"
 #include "MagickCore/timer.h"
 
 /*
diff --git a/MagickCore/type.c b/MagickCore/type.c
index 4be03715b..c7f2133ff 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.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 634a40d81..296cf7ea2 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.h"
 #include "MagickCore/option.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/resource_.h"
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 295113fc8..a89f92a40 100644
--- 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  "6876"
+#define MagickSVNRevision  "6913"
 #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-19"
+#define MagickReleaseDate  "2012-02-20"
 #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 99bad6718..8557967c8 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.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 ad20b5229..f211c8d4d 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/xwindow-private.h"
 
diff --git a/MagickWand/display.c b/MagickWand/display.c
index efac20d04..d556f89d2 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/xwindow-private.h"
 
diff --git a/Makefile.in b/Makefile.in
index 770220a51..2e2a8789d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -475,37 +475,36 @@ 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 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 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 \
@@ -594,31 +593,30 @@ am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \
 	MagickCore/MagickCore_libMagickCore_la-widget.lo \
 	MagickCore/MagickCore_libMagickCore_la-xml-tree.lo \
 	MagickCore/MagickCore_libMagickCore_la-xwindow.lo
-@WIN32_NATIVE_BUILD_TRUE@am__objects_2 = MagickCore/MagickCore_libMagickCore_la-nt-base.lo
-@DPS_DELEGATE_TRUE@am__objects_3 =  \
+@DPS_DELEGATE_TRUE@am__objects_2 =  \
 @DPS_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-dps.lo
-@DJVU_DELEGATE_TRUE@am__objects_4 = coders/MagickCore_libMagickCore_la-djvu.lo
-@OPENEXR_DELEGATE_TRUE@am__objects_5 = coders/MagickCore_libMagickCore_la-exr.lo
-@FPX_DELEGATE_TRUE@am__objects_6 =  \
+@DJVU_DELEGATE_TRUE@am__objects_3 = coders/MagickCore_libMagickCore_la-djvu.lo
+@OPENEXR_DELEGATE_TRUE@am__objects_4 = coders/MagickCore_libMagickCore_la-exr.lo
+@FPX_DELEGATE_TRUE@am__objects_5 =  \
 @FPX_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-fpx.lo
-@WINGDI32_DELEGATE_TRUE@am__objects_7 = coders/MagickCore_libMagickCore_la-clipboard.lo \
+@WINGDI32_DELEGATE_TRUE@am__objects_6 = coders/MagickCore_libMagickCore_la-clipboard.lo \
 @WINGDI32_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-emf.lo
-@JBIG_DELEGATE_TRUE@am__objects_8 = coders/MagickCore_libMagickCore_la-jbig.lo
-@JPEG_DELEGATE_TRUE@am__objects_9 = coders/MagickCore_libMagickCore_la-jpeg.lo
-@JP2_DELEGATE_TRUE@am__objects_10 =  \
+@JBIG_DELEGATE_TRUE@am__objects_7 = coders/MagickCore_libMagickCore_la-jbig.lo
+@JPEG_DELEGATE_TRUE@am__objects_8 = coders/MagickCore_libMagickCore_la-jpeg.lo
+@JP2_DELEGATE_TRUE@am__objects_9 =  \
 @JP2_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-jp2.lo
-@PNG_DELEGATE_TRUE@am__objects_11 =  \
+@PNG_DELEGATE_TRUE@am__objects_10 =  \
 @PNG_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-png.lo
-@TIFF_DELEGATE_TRUE@am__objects_12 =  \
+@TIFF_DELEGATE_TRUE@am__objects_11 =  \
 @TIFF_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-ept.lo \
 @TIFF_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-tiff.lo
-@WEBP_DELEGATE_TRUE@am__objects_13 = coders/MagickCore_libMagickCore_la-webp.lo
-@WMF_DELEGATE_TRUE@am__objects_14 =  \
+@WEBP_DELEGATE_TRUE@am__objects_12 = coders/MagickCore_libMagickCore_la-webp.lo
+@WMF_DELEGATE_TRUE@am__objects_13 =  \
 @WMF_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-wmf.lo
-@X11_DELEGATE_TRUE@am__objects_15 =  \
+@X11_DELEGATE_TRUE@am__objects_14 =  \
 @X11_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-x.lo \
 @X11_DELEGATE_TRUE@	coders/MagickCore_libMagickCore_la-xwd.lo
-am__objects_16 = coders/MagickCore_libMagickCore_la-aai.lo \
+am__objects_15 = coders/MagickCore_libMagickCore_la-aai.lo \
 	coders/MagickCore_libMagickCore_la-art.lo \
 	coders/MagickCore_libMagickCore_la-avs.lo \
 	coders/MagickCore_libMagickCore_la-bgr.lo \
@@ -718,17 +716,17 @@ am__objects_16 = coders/MagickCore_libMagickCore_la-aai.lo \
 	coders/MagickCore_libMagickCore_la-xpm.lo \
 	coders/MagickCore_libMagickCore_la-xps.lo \
 	coders/MagickCore_libMagickCore_la-ycbcr.lo \
-	coders/MagickCore_libMagickCore_la-yuv.lo $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
-	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
-	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
-	$(am__objects_13) $(am__objects_14) $(am__objects_15)
-am__objects_17 = filters/MagickCore_libMagickCore_la-analyze.lo
+	coders/MagickCore_libMagickCore_la-yuv.lo $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
+	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
+	$(am__objects_12) $(am__objects_13) $(am__objects_14)
+am__objects_16 = filters/MagickCore_libMagickCore_la-analyze.lo
 @WITH_MODULES_FALSE@am_MagickCore_libMagickCore_la_OBJECTS =  \
-@WITH_MODULES_FALSE@	$(am__objects_1) $(am__objects_2) \
-@WITH_MODULES_FALSE@	$(am__objects_16) $(am__objects_17)
+@WITH_MODULES_FALSE@	$(am__objects_1) $(am__objects_15) \
+@WITH_MODULES_FALSE@	$(am__objects_16)
 @WITH_MODULES_TRUE@am_MagickCore_libMagickCore_la_OBJECTS =  \
-@WITH_MODULES_TRUE@	$(am__objects_1) $(am__objects_2)
+@WITH_MODULES_TRUE@	$(am__objects_1)
 MagickCore_libMagickCore_la_OBJECTS =  \
 	$(am_MagickCore_libMagickCore_la_OBJECTS)
 MagickCore_libMagickCore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -738,7 +736,7 @@ MagickCore_libMagickCore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 MagickWand_libMagickWand_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am__objects_18 = MagickWand/MagickWand_libMagickWand_la-animate.lo \
+am__objects_17 = MagickWand/MagickWand_libMagickWand_la-animate.lo \
 	MagickWand/MagickWand_libMagickWand_la-compare.lo \
 	MagickWand/MagickWand_libMagickWand_la-composite.lo \
 	MagickWand/MagickWand_libMagickWand_la-conjure.lo \
@@ -760,7 +758,7 @@ am__objects_18 = MagickWand/MagickWand_libMagickWand_la-animate.lo \
 	MagickWand/MagickWand_libMagickWand_la-stream.lo \
 	MagickWand/MagickWand_libMagickWand_la-wand.lo \
 	MagickWand/MagickWand_libMagickWand_la-wand-view.lo
-am_MagickWand_libMagickWand_la_OBJECTS = $(am__objects_18)
+am_MagickWand_libMagickWand_la_OBJECTS = $(am__objects_17)
 MagickWand_libMagickWand_la_OBJECTS =  \
 	$(am_MagickWand_libMagickWand_la_OBJECTS)
 MagickWand_libMagickWand_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1720,12 +1718,12 @@ ltdl_libltdl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	-o $@
 @INSTALL_LTDL_TRUE@am_ltdl_libltdl_la_rpath = -rpath $(libdir)
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-am__objects_19 = ltdl/loaders/ltdl_libltdlc_la-preopen.lo \
+am__objects_18 = ltdl/loaders/ltdl_libltdlc_la-preopen.lo \
 	ltdl/ltdl_libltdlc_la-lt__alloc.lo \
 	ltdl/ltdl_libltdlc_la-lt_dlloader.lo \
 	ltdl/ltdl_libltdlc_la-lt_error.lo \
 	ltdl/ltdl_libltdlc_la-ltdl.lo ltdl/ltdl_libltdlc_la-slist.lo
-am_ltdl_libltdlc_la_OBJECTS = $(am__objects_19)
+am_ltdl_libltdlc_la_OBJECTS = $(am__objects_18)
 ltdl_libltdlc_la_OBJECTS = $(am_ltdl_libltdlc_la_OBJECTS)
 ltdl_libltdlc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -4148,10 +4146,16 @@ MAGICKCORE_BASE_SRCS = \
 	MagickCore/xwindow.c \
 	MagickCore/xwindow.h 
 
-@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
+@CYGWIN_BUILD_FALSE@@WIN32_NATIVE_BUILD_FALSE@MAGICK_PLATFORM_SRCS = 
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@MAGICK_PLATFORM_SRCS = \
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@  magick/nt-feature.c \
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@  magick/nt-feature.h
+
+@WIN32_NATIVE_BUILD_TRUE@MAGICK_PLATFORM_SRCS = \
+@WIN32_NATIVE_BUILD_TRUE@  magick/nt-base.c \
+@WIN32_NATIVE_BUILD_TRUE@  magick/nt-base.h \
+@WIN32_NATIVE_BUILD_TRUE@  magick/nt-feature.c \
+@WIN32_NATIVE_BUILD_TRUE@  magick/nt-feature.h
 
 MAGICKCORE_INCLUDE_HDRS = \
 	MagickCore/MagickCore.h \
@@ -4318,6 +4322,7 @@ MAGICKCORE_EXTRA_DIST = \
 	MagickCore/config.h_vms \
 	MagickCore/mac.c \
 	MagickCore/nt-base.c \
+	MagickCore/nt-featur.c \
 	MagickCore/vms.c \
 	MagickCore/xwdfile.h_vms 
 
@@ -5423,9 +5428,6 @@ MagickCore/MagickCore_libMagickCore_la-xml-tree.lo:  \
 MagickCore/MagickCore_libMagickCore_la-xwindow.lo:  \
 	MagickCore/$(am__dirstamp) \
 	MagickCore/$(DEPDIR)/$(am__dirstamp)
-MagickCore/MagickCore_libMagickCore_la-nt-base.lo:  \
-	MagickCore/$(am__dirstamp) \
-	MagickCore/$(DEPDIR)/$(am__dirstamp)
 coders/$(am__dirstamp):
 	@$(MKDIR_P) coders
 	@: > coders/$(am__dirstamp)
@@ -6741,8 +6743,6 @@ mostlyclean-compile:
 	-rm -f MagickCore/MagickCore_libMagickCore_la-montage.lo
 	-rm -f MagickCore/MagickCore_libMagickCore_la-morphology.$(OBJEXT)
 	-rm -f MagickCore/MagickCore_libMagickCore_la-morphology.lo
-	-rm -f MagickCore/MagickCore_libMagickCore_la-nt-base.$(OBJEXT)
-	-rm -f MagickCore/MagickCore_libMagickCore_la-nt-base.lo
 	-rm -f MagickCore/MagickCore_libMagickCore_la-option.$(OBJEXT)
 	-rm -f MagickCore/MagickCore_libMagickCore_la-option.lo
 	-rm -f MagickCore/MagickCore_libMagickCore_la-paint.$(OBJEXT)
@@ -7475,7 +7475,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-monitor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-montage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-morphology.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-option.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-paint.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-pixel.Plo@am__quote@
@@ -8444,13 +8443,6 @@ MagickCore/MagickCore_libMagickCore_la-xwindow.lo: MagickCore/xwindow.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) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-xwindow.lo `test -f 'MagickCore/xwindow.c' || echo '$(srcdir)/'`MagickCore/xwindow.c
 
-MagickCore/MagickCore_libMagickCore_la-nt-base.lo: MagickCore/nt-base.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-nt-base.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-nt-base.lo `test -f 'MagickCore/nt-base.c' || echo '$(srcdir)/'`MagickCore/nt-base.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='MagickCore/nt-base.c' object='MagickCore/MagickCore_libMagickCore_la-nt-base.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) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-nt-base.lo `test -f 'MagickCore/nt-base.c' || echo '$(srcdir)/'`MagickCore/nt-base.c
-
 coders/MagickCore_libMagickCore_la-aai.lo: coders/aai.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-aai.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Tpo -c -o coders/MagickCore_libMagickCore_la-aai.lo `test -f 'coders/aai.c' || echo '$(srcdir)/'`coders/aai.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Plo
diff --git a/coders/clipboard.c b/coders/clipboard.c
index 9db4794d5..bbeabc607 100644
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -58,8 +58,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
-#include "MagickCore/nt-base.h"
-#include "MagickCore/nt-base-private.h"
+#include "MagickCore/nt-feature.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantum-private.h"
 #include "MagickCore/static.h"
diff --git a/coders/icon.c b/coders/icon.c
index 63eec997d..75be2e44a 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.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 8b5dce9d0..db3651704 100644
--- 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-base-private.h"
+#include "MagickCore/nt-feature.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 17480c625..3f5e4cb08 100644
--- 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="6876" />
-  <configure name="RELEASE_DATE" value="2012-02-19"/>
+  <configure name="SVN_REVISION" value="6913" />
+  <configure name="RELEASE_DATE" value="2012-02-20"/>
   <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 f15867c60..5b620f27b 100755
--- 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=6876
+MAGICK_SVN_REVISION=6913