From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 29 Feb 2012 12:42:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7139e0e0b734887d20d34816d9e2b44b9930fca;p=imagemagick

---

diff --git a/MagickCore/method-attribute.h b/MagickCore/method-attribute.h
index 4b79d2a6f..8141794b0 100644
--- a/MagickCore/method-attribute.h
+++ b/MagickCore/method-attribute.h
@@ -105,7 +105,7 @@ extern "C" {
 
 #define MagickSignature  0xabacadabUL
 #if !defined(MaxTextExtent)
-# define MaxTextExtent  4096
+# define MaxTextExtent  8192
 #endif
 
 #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index aca44fdcc..0be1f21fa 100644
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -16,8 +16,8 @@
   MagickWand Application Programming Interface declarations.
 */
 
-#ifndef _MAGICK_WAND_H
-#define _MAGICK_WAND_H
+#ifndef _MAGICKWAND_MAGICKWAND_H
+#define _MAGICKWAND_MAGICKWAND_H
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -61,6 +61,8 @@ extern "C" {
 #  define _MAGICKLIB_
 #endif
 
+#include "MagickWand/method-attribute.h"
+
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
 # define WandPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
@@ -116,11 +118,6 @@ extern "C" {
 # define WandGlobal
 #endif
 
-#if !defined(MaxTextExtent)
-# define MaxTextExtent  4096
-#endif
-#define WandSignature  0xabacadabUL
-
 #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
 #  define wand_aligned(x)  __attribute__((__aligned__(x)))
 #  define wand_attribute  __attribute__
diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 3b9c59214..ef258a3e1 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -107,6 +107,7 @@ static MagickWand *CloneMagickWandFromImages(const MagickWand *wand,
   clone_wand->id=AcquireWandId();
   (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g",
     MagickWandId,(double) clone_wand->id);
+  clone_wand->exception=AcquireExceptionInfo();
   InheritException(clone_wand->exception,wand->exception);
   clone_wand->image_info=CloneImageInfo(wand->image_info);
   clone_wand->images=images;
diff --git a/MagickWand/method-attribute.h b/MagickWand/method-attribute.h
index 40d5e2c96..aa4ac7f4f 100644
--- a/MagickWand/method-attribute.h
+++ b/MagickWand/method-attribute.h
@@ -96,9 +96,9 @@ extern "C" {
 # define MagickGlobal
 #endif
 
-#define MagickSignature  0xabacadabUL
+#define WandSignature  0xabacadabUL
 #if !defined(MaxTextExtent)
-# define MaxTextExtent  4096
+# define MaxTextExtent  8192
 #endif
 
 #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 72f17e0a7..e1de6bd00 100644
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -172,6 +172,8 @@ extern size_t strlcpy(char *,const char *,size_t);
 extern int vsnprintf(char *,size_t,const char *,va_list);
 #endif
 
+#include "MagickWand/method-attribute.h"
+
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT)
 # include <sys/types.h>
 # include <sys/stat.h>
@@ -224,7 +226,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 #  endif
 #  include <unix.h>
 # endif
-# include "MagickWand/MagickWand.h"
 #endif
 
 #if defined(S_IRUSR) && defined(S_IWUSR)
@@ -245,8 +246,6 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
 # include "MagickCore/vms.h"
 #endif
 
-#include "MagickWand/MagickWand.h"
-
 #undef HAVE_CONFIG_H
 #undef gamma
 #undef index