call MagickWandGenesis()/MagickWandTerminus()

ImageMagick · Jul 18, 2021 · 64aef14 · 64aef14
1 parent 5b9a9db
commit 64aef14
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 17 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -5181,14 +5181,14 @@ WAND_INCLUDE_HDRS = \
 	wand/pixel-iterator.h \
 	wand/pixel-wand.h \
 	wand/stream.h \
-	wand/wand.h \
 	wand/wand-view.h
 
 WAND_NOINST_HDRS = \
 	wand/mogrify-private.h \
 	wand/magick-wand-private.h \
 	wand/pixel-wand-private.h \
-	wand/studio.h
+	wand/studio.h \
+	wand/wand.h
 
 
 # Headers which are installed

diff --git a/configure b/configure
@@ -4552,7 +4552,7 @@ MAGICK_PATCHLEVEL_VERSION=19
 
 MAGICK_VERSION=6.9.12-19
 
-MAGICK_GIT_REVISION=16727:2f3cc2cf8:20210718
+MAGICK_GIT_REVISION=16729:5b9a9dbbe:20210718
 
 
 # Substitute library versioning

diff --git a/utilities/animate.c b/utilities/animate.c
@@ -79,13 +79,14 @@ static int AnimateMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,AnimateImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/compare.c b/utilities/compare.c
@@ -78,6 +78,7 @@ static int CompareMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   metadata=(char *) NULL;
@@ -89,7 +90,7 @@ static int CompareMain(int argc,char **argv)
   dissimilar=IsMagickTrue(option);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   if (dissimilar != MagickFalse)
     return(1);

diff --git a/utilities/composite.c b/utilities/composite.c
@@ -70,13 +70,14 @@ static int CompositeMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,CompositeImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/conjure.c b/utilities/conjure.c
@@ -89,13 +89,14 @@ static int ConjureMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,ConjureImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/convert.c b/utilities/convert.c
@@ -76,13 +76,14 @@ static int ConvertMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,ConvertImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/display.c b/utilities/display.c
@@ -84,13 +84,14 @@ static int DisplayMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,DisplayImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/identify.c b/utilities/identify.c
@@ -74,6 +74,7 @@ static int IdentifyMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   metadata=(char *) NULL;
@@ -83,7 +84,7 @@ static int IdentifyMain(int argc,char **argv)
     metadata=DestroyString(metadata);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/import.c b/utilities/import.c
@@ -76,13 +76,14 @@ static int ImportMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,ImportImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/mogrify.c b/utilities/mogrify.c
@@ -72,13 +72,14 @@ static int MogrifyMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,MogrifyImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/montage.c b/utilities/montage.c
@@ -72,13 +72,14 @@ static int MontageMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,MontageImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/utilities/stream.c b/utilities/stream.c
@@ -72,13 +72,14 @@ static int StreamMain(int argc,char **argv)
     status;
 
   MagickCoreGenesis(*argv,MagickTrue);
+  MagickWandGenesis();
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
   status=MagickCommandGenesis(image_info,StreamImageCommand,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
-  DestroyWandIds();
+  MagickWandTerminus();
   MagickCoreTerminus();
   return(status != MagickFalse ? 0 : 1);
 }

diff --git a/wand/MagickWand.h b/wand/MagickWand.h
@@ -92,7 +92,6 @@ typedef struct _MagickWand
 #include "wand/pixel-iterator.h"
 #include "wand/pixel-wand.h"
 #include "wand/stream.h"
-#include "wand/wand.h"
 #include "wand/wand-view.h"
 
 extern WandExport char

diff --git a/wand/Makefile.am b/wand/Makefile.am
@@ -89,14 +89,14 @@ WAND_INCLUDE_HDRS = \
 	wand/pixel-iterator.h \
 	wand/pixel-wand.h \
 	wand/stream.h \
-	wand/wand.h \
 	wand/wand-view.h
 
 WAND_NOINST_HDRS = \
 	wand/mogrify-private.h \
 	wand/magick-wand-private.h \
 	wand/pixel-wand-private.h \
-	wand/studio.h
+	wand/studio.h \
+	wand/wand.h
 
 # Headers which are installed
 wandinc_HEADERS = \