(no commit message)

diff --git a/MagickCore/blob-private.h b/MagickCore/blob-private.h
index ba3bba6629a117717995095ede3c6e4f6fdc5538..13cc36645c75c18c840d5a64ea09cabd53e36288 100644 (file)
--- a/MagickCore/blob-private.h
+++ b/MagickCore/blob-private.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include "MagickCore/nt-base-private.h"
+
 #define MagickMinBlobExtent  32767L
 #if defined(MAGICKCORE_HAVE_FSEEKO)
 # define fseek  fseeko

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 371d28a43c6aa279c965e84e8cc3209dc629f4a0..3d1e5498d789aa96fcbda619754b095d65d9510b 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2055,7 +2055,8 @@ MagickExport MagickBooleanType ModifyImage(Image **image,
 %  The format of the NewMagickImage method is:
 %
 %      Image *NewMagickImage(const ImageInfo *image_info,
-%        const size_t width,const size_t height,const PixelInfo *background)
+%        const size_t width,const size_t height,const PixelInfo *background,
+%        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -2067,16 +2068,16 @@ MagickExport MagickBooleanType ModifyImage(Image **image,
 %
 %    o background: the image color.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
 MagickExport Image *NewMagickImage(const ImageInfo *image_info,
-  const size_t width,const size_t height,const PixelInfo *background)
+  const size_t width,const size_t height,const PixelInfo *background,
+  ExceptionInfo *exception)
 {
   CacheView
     *image_view;
 
-  ExceptionInfo
-    *exception;
-
   Image
     *image;
 

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 288e844672cf4ab179e287ff6aa6668f50450d77..de79c1eaa1d706f73663404422de69aab5a1f444 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -505,8 +505,8 @@ extern MagickExport Image
   *DestroyImage(Image *),
   *GetImageClipMask(const Image *,ExceptionInfo *),
   *GetImageMask(const Image *,ExceptionInfo *),
-  *NewMagickImage(const ImageInfo *,const size_t,const size_t,
-    const PixelInfo *),
+  *NewMagickImage(const ImageInfo *,const size_t,const size_t,const PixelInfo *,
+    ExceptionInfo *),
   *ReferenceImage(Image *),
   *SeparateImages(const Image *,ExceptionInfo *),
   *SmushImages(const Image *,const MagickBooleanType,const ssize_t,

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index daca3b85d31bb72cf8065c0fe89b3aefe6750ff1..555b0436db31e6bddc939544fbda16ff83fba4e4 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -64,9 +64,7 @@
 #include "MagickCore/mime-private.h"
 #include "MagickCore/module.h"
 #include "MagickCore/module-private.h"
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "MagickCore/nt-feature.h"
-#endif
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/random-private.h"
 #include "MagickCore/registry.h"
 #include "MagickCore/registry-private.h"

diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
index fef1dbe8c0297ad8a7d07663ea41d8887a537a62..c10818a4dcd83739f43d835df8a3c8aefe58531b 100644 (file)
--- a/MagickCore/nt-base-private.h
+++ b/MagickCore/nt-base-private.h
@@ -27,6 +27,7 @@ extern "C" {
 #include "MagickCore/delegate.h"
 #include "MagickCore/delegate-private.h"
 #include "MagickCore/exception.h"
+#include "MagickCore/splay-tree.h"
 
 #define WIN32_LEAN_AND_MEAN
 #define VC_EXTRALEAN

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index a4c1da97b9e59a0cf41c2ab893ddf4da12b0dc30..13557144955236ed229a40c14f3829e8a91844a4 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -41,15 +41,25 @@
 #include "MagickCore/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"
 #if defined(MAGICKCORE_LTDL_DELEGATE)
@@ -585,8 +595,6 @@ MagickExport void *ImageToHBITMAP(Image *image)
   return((void *) bitmapH);
 }
 \f
-#endif
-\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %

diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index f0e33a603cdff4a1faae3a950e881b907ea2f238..c943ed5711cc0e0c5fe26d1cb59ac754e97966a1 100644 (file)
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include "MagickCore/splay-tree.h"
+#include "MagickCore/geometry.h"
 
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
 extern MagickExport void

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 0aa4268dd1bb99359e86ac9b204749e2005b79ee..61eb9aea46271cff89cbf28219694e90027bb778 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -67,6 +67,7 @@
 #include "MagickCore/list.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/quantum.h"
 #include "MagickCore/resource_.h"

diff --git a/MagickCore/timer.c b/MagickCore/timer.c
index c42f23b12003293ca9275052a24917d33779dc94..56ee58c699c6f91073ed641440bfc05f00550c4d 100644 (file)
--- a/MagickCore/timer.c
+++ b/MagickCore/timer.c
@@ -45,6 +45,7 @@
 #include "MagickCore/exception-private.h"
 #include "MagickCore/log.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/timer.h"
 \f
 /*

diff --git a/MagickCore/type.c b/MagickCore/type.c
index 3e1cdcf20adb377d603aa35aa9e7bf02a02a3a44..8a68ce887cdcd4f6329288a6d51f46e1bb5f53aa 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -49,6 +49,7 @@
 #include "MagickCore/hashmap.h"
 #include "MagickCore/log.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/semaphore.h"
 #include "MagickCore/splay-tree.h"
@@ -92,9 +93,6 @@
 #define FC_WEIGHT_HEAVY            FC_WEIGHT_BLACK
 #endif
 #endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "MagickCore/nt-feature.h"
-#endif
 \f
 /*
   Define declarations.

diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
index c90186c8abea6a8dd136e41ea7f4e8b40cc197dc..df925ed67c81e08947a4196b2f19dc0f689c884b 100644 (file)
--- a/MagickCore/utility-private.h
+++ b/MagickCore/utility-private.h
@@ -22,6 +22,9 @@
 extern "C" {
 #endif
 
+#include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
+
 extern MagickPrivate char
   **GetPathComponents(const char *,size_t *),
   **ListFiles(const char *,const char *,size_t *);
@@ -60,7 +63,7 @@ static inline int access_utf8(const char *path,int mode)
      return(-1);
    count=MultiByteToWideChar(CP_UTF8,0,path,-1,path_wide,count);
    status=_waccess(path_wide,mode);
-   path_wide=RelinquishMagickMemory(path_wide);
+   path_wide=(WCHAR *) RelinquishMagickMemory(path_wide);
    return(status);
 #endif
 }
@@ -90,13 +93,13 @@ static inline FILE *fopen_utf8(const char *path,const char *mode)
    mode_wide=(WCHAR *) AcquireQuantumMemory(count,sizeof(*mode_wide));
    if (mode_wide == (WCHAR *) NULL)
      {
-       path_wide=RelinquishMagickMemory(path_wide);
+       path_wide=(WCHAR *) RelinquishMagickMemory(path_wide);
        return((FILE *) NULL);
      }
    count=MultiByteToWideChar(CP_UTF8,0,mode,-1,mode_wide,count);
    file=_wfopen(path_wide,mode_wide);
-   mode_wide=RelinquishMagickMemory(mode_wide);
-   path_wide=RelinquishMagickMemory(path_wide);
+   mode_wide=(WCHAR *) RelinquishMagickMemory(mode_wide);
+   path_wide=(WCHAR *) RelinquishMagickMemory(path_wide);
    return(file);
 #endif
 }
@@ -120,7 +123,7 @@ static inline int open_utf8(const char *path,int flags,int mode)
      return(-1);
    count=MultiByteToWideChar(CP_UTF8,0,path,-1,path_wide,count);
    status=_wopen(path_wide,flags,mode);
-   path_wide=RelinquishMagickMemory(path_wide);
+   path_wide=(WCHAR *) RelinquishMagickMemory(path_wide);
    return(status);
 #endif
 }
@@ -150,13 +153,13 @@ static inline FILE *popen_utf8(const char *command,const char *type)
    type_wide=(WCHAR *) AcquireQuantumMemory(count,sizeof(*type_wide));
    if (type_wide == (WCHAR *) NULL)
      {
-       command_wide=RelinquishMagickMemory(command_wide);
+       command_wide=(WCHAR *) RelinquishMagickMemory(command_wide);
        return((FILE *) NULL);
      }
    count=MultiByteToWideChar(CP_UTF8,0,type,-1,type_wide,count);
    file=_wpopen(command_wide,type_wide);
-   type_wide=RelinquishMagickMemory(type_wide);
-   command_wide=RelinquishMagickMemory(command_wide);
+   type_wide=(WCHAR *) RelinquishMagickMemory(type_wide);
+   command_wide=(WCHAR *) RelinquishMagickMemory(command_wide);
    return(file);
 #endif
 }
@@ -180,7 +183,7 @@ static inline int remove_utf8(const char *path)
      return(-1);
    count=MultiByteToWideChar(CP_UTF8,0,path,-1,path_wide,count);
    status=_wremove(path_wide);
-   path_wide=RelinquishMagickMemory(path_wide);
+   path_wide=(WCHAR *) RelinquishMagickMemory(path_wide);
    return(status);
 #endif
 }
@@ -209,13 +212,13 @@ static inline int rename_utf8(const char *source,const char *destination)
      sizeof(*destination_wide));
    if (destination_wide == (WCHAR *) NULL)
      {
-       source_wide=RelinquishMagickMemory(source_wide);
+       source_wide=(WCHAR *) RelinquishMagickMemory(source_wide);
        return(-1);
      }
    count=MultiByteToWideChar(CP_UTF8,0,destination,-1,destination_wide,count);
    status=_wrename(source_wide,destination_wide);
-   destination_wide=RelinquishMagickMemory(destination_wide);
-   source_wide=RelinquishMagickMemory(source_wide);
+   destination_wide=(WCHAR *) RelinquishMagickMemory(destination_wide);
+   source_wide=(WCHAR *) RelinquishMagickMemory(source_wide);
    return(status);
 #endif
 }
@@ -238,8 +241,8 @@ static inline int stat_utf8(const char *path,struct stat *attributes)
    if (path_wide == (WCHAR *) NULL)
      return(-1);
    count=MultiByteToWideChar(CP_UTF8,0,path,-1,path_wide,count);
-   status=wstat(path_wide,attributes);
-   path_wide=RelinquishMagickMemory(path_wide);
+   status=_wstat64(path_wide,attributes);
+   path_wide=(WCHAR *) RelinquishMagickMemory(path_wide);
    return(status);
 #endif
 }

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index 7183bd7030106862d99c233bfae37544bbb13436..0cfd9b26ba527665e44ab80b5ee79948306e141b 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -50,6 +50,7 @@
 #include "MagickCore/log.h"
 #include "MagickCore/magick-private.h"
 #include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/policy.h"
 #include "MagickCore/resource_.h"

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 0654b6585d51dbd0a25eea09ae92a7cb58400a43..435496f4ebfda82201831ae56a804fda997787aa 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -62,6 +62,7 @@
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/monitor.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/pixel-accessor.h"
 #include "MagickCore/PreRvIcccm.h"

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

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index d7f08f04847c87e06c60e3eeba74bfc5cd1480fa..2ddadc1829e553bbd1dfb51e563b62ba36082ff3 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -43,6 +43,7 @@
 #include "MagickWand/studio.h"
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/string-private.h"
 \f
 /*

diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c
index ade0137296df0804e747ddb375954e27e21402e0..f75c84caefc6937c3e76e77a058cfe8695f1894c 100644 (file)
--- a/MagickWand/conjure.c
+++ b/MagickWand/conjure.c
@@ -48,6 +48,7 @@
 #include "MagickWand/studio.h"
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
+#include "MagickCore/nt-base-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index 44655487b37449193668c863b4dd402e88648980..2c2d5ec652ae2c2ff17d3a1e50f4d2b706d661b9 100644 (file)
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -45,6 +45,7 @@
 #include "MagickWand/studio.h"
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/utility-private.h"
 /*

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

diff --git a/MagickWand/identify.c b/MagickWand/identify.c
index df1c0717285a2eca7d0b0bd0a0ee56dbf1b900c7..3313f2927ef5829428678b97b52ce71dbe804435 100644 (file)
--- a/MagickWand/identify.c
+++ b/MagickWand/identify.c
@@ -50,6 +50,7 @@
 #include "MagickWand/studio.h"
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
+#include "MagickCore/nt-base-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickWand/import.c b/MagickWand/import.c
index c87f3a0b3df93ea395ac8f11ddff7d572fa87ce9..d2c31db2d5be3748591bfa8ac0cb729ba30bb53d 100644 (file)
--- a/MagickWand/import.c
+++ b/MagickWand/import.c
@@ -44,6 +44,7 @@
 #include "MagickWand/studio.h"
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/string-private.h"
 #include "MagickCore/xwindow-private.h"
 \f

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index e261aaafdfabedc59778a2284f8309ecaf030a52..9392f4cac51a51989f0c209a95dbcba975f53c00 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -6732,9 +6732,8 @@ WandExport MagickBooleanType MagickNegateImage(MagickWand *wand,
 %    o background: the image color.
 %
 */
-WandExport MagickBooleanType MagickNewImage(MagickWand *wand,
-  const size_t width,const size_t height,
-  const PixelWand *background)
+WandExport MagickBooleanType MagickNewImage(MagickWand *wand,const size_t width,
+  const size_t height,const PixelWand *background)
 {
   Image
     *images;
@@ -6747,11 +6746,9 @@ WandExport MagickBooleanType MagickNewImage(MagickWand *wand,
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   PixelGetMagickColor(background,&pixel);
-  images=NewMagickImage(wand->image_info,width,height,&pixel);
+  images=NewMagickImage(wand->image_info,width,height,&pixel,&wand->exception);
   if (images == (Image *) NULL)
     return(MagickFalse);
-  if (images->exception.severity != UndefinedException)
-    InheritException(wand->exception,&images->exception);
   return(InsertImageInWand(wand,images));
 }
 \f

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index a4d1e2f136da9f22d1cb33cf8d37d21798ae50a4..8da0dabcf1ad651afa449031b2728815dd288859 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -51,8 +51,9 @@
 #undef RadiansToDegrees
 #include "MagickCore/image-private.h"
 #include "MagickCore/monitor-private.h"
-#include "MagickCore/thread-private.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
 #include "MagickCore/utility-private.h"
 \f
 /*

diff --git a/MagickWand/stream.c b/MagickWand/stream.c
index ac14535e3b00c057495a1fe0ca69f54b6bf61f8f..9ccf43361ccce0797037be4107385c088d44dc6e 100644 (file)
--- a/MagickWand/stream.c
+++ b/MagickWand/stream.c
@@ -47,6 +47,7 @@
 #include "MagickWand/studio.h"
 #include "MagickWand/MagickWand.h"
 #include "MagickWand/mogrify-private.h"
+#include "MagickCore/nt-base-private.h"
 #include "MagickCore/stream-private.h"
 \f
 /*