Update ImageMagick from 7.1.1-21 -> 7.1.1-22

MolotovCherry · Dec 5, 2023 · c16817d · c16817d
1 parent be01aae
commit c16817d
Show file tree

Hide file tree

Showing 643 changed files with 1,317 additions and 888 deletions.
diff --git a/Android.mk b/Android.mk
@@ -30,7 +30,7 @@ OPENCL_INCLUDE_PATH             := $(OPENCL_PATH)/qualcomm/include
 
 LTDL_LIB_PATH                   := $(LOCAL_PATH)/libltdl-2.4.6
 
-IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.1-21
+IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.1-22
 IMAGE_MAGICK                    := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR)
 
 JPEG_LIB_PATH                   := $(LOCAL_PATH)/libjpeg-turbo-2.0.2

diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Blob.cpp → ImageMagick-7.1.1-22/Magick++/lib/Blob.cpp b/ImageMagick-7.1.1-21/Magick++/lib/Blob.cpp → ImageMagick-7.1.1-22/Magick++/lib/Blob.cpp
diff --git a/...eMagick-7.1.1-21/Magick++/lib/BlobRef.cpp → ...eMagick-7.1.1-22/Magick++/lib/BlobRef.cpp b/...eMagick-7.1.1-21/Magick++/lib/BlobRef.cpp → ...eMagick-7.1.1-22/Magick++/lib/BlobRef.cpp
diff --git a/...agick-7.1.1-21/Magick++/lib/CoderInfo.cpp → ...agick-7.1.1-22/Magick++/lib/CoderInfo.cpp b/...agick-7.1.1-21/Magick++/lib/CoderInfo.cpp → ...agick-7.1.1-22/Magick++/lib/CoderInfo.cpp
diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Color.cpp → ImageMagick-7.1.1-22/Magick++/lib/Color.cpp b/ImageMagick-7.1.1-21/Magick++/lib/Color.cpp → ImageMagick-7.1.1-22/Magick++/lib/Color.cpp
diff --git a/...Magick-7.1.1-21/Magick++/lib/Drawable.cpp → ...Magick-7.1.1-22/Magick++/lib/Drawable.cpp b/...Magick-7.1.1-21/Magick++/lib/Drawable.cpp → ...Magick-7.1.1-22/Magick++/lib/Drawable.cpp
diff --git a/...agick-7.1.1-21/Magick++/lib/Exception.cpp → ...agick-7.1.1-22/Magick++/lib/Exception.cpp b/...agick-7.1.1-21/Magick++/lib/Exception.cpp → ...agick-7.1.1-22/Magick++/lib/Exception.cpp
diff --git a/...agick-7.1.1-21/Magick++/lib/Functions.cpp → ...agick-7.1.1-22/Magick++/lib/Functions.cpp b/...agick-7.1.1-21/Magick++/lib/Functions.cpp → ...agick-7.1.1-22/Magick++/lib/Functions.cpp
diff --git a/...Magick-7.1.1-21/Magick++/lib/Geometry.cpp → ...Magick-7.1.1-22/Magick++/lib/Geometry.cpp b/...Magick-7.1.1-21/Magick++/lib/Geometry.cpp → ...Magick-7.1.1-22/Magick++/lib/Geometry.cpp
diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Image.cpp → ImageMagick-7.1.1-22/Magick++/lib/Image.cpp b/ImageMagick-7.1.1-21/Magick++/lib/Image.cpp → ImageMagick-7.1.1-22/Magick++/lib/Image.cpp
diff --git a/...Magick-7.1.1-21/Magick++/lib/ImageRef.cpp → ...Magick-7.1.1-22/Magick++/lib/ImageRef.cpp b/...Magick-7.1.1-21/Magick++/lib/ImageRef.cpp → ...Magick-7.1.1-22/Magick++/lib/ImageRef.cpp
diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++.h → ImageMagick-7.1.1-22/Magick++/lib/Magick++.h b/ImageMagick-7.1.1-21/Magick++/lib/Magick++.h → ImageMagick-7.1.1-22/Magick++/lib/Magick++.h
diff --git a/...ick-7.1.1-21/Magick++/lib/Magick++/Blob.h → ...ick-7.1.1-22/Magick++/lib/Magick++/Blob.h b/...ick-7.1.1-21/Magick++/lib/Magick++/Blob.h → ...ick-7.1.1-22/Magick++/lib/Magick++/Blob.h
diff --git a/...-7.1.1-21/Magick++/lib/Magick++/BlobRef.h → ...-7.1.1-22/Magick++/lib/Magick++/BlobRef.h b/...-7.1.1-21/Magick++/lib/Magick++/BlobRef.h → ...-7.1.1-22/Magick++/lib/Magick++/BlobRef.h
diff --git a/....1.1-21/Magick++/lib/Magick++/CoderInfo.h → ....1.1-22/Magick++/lib/Magick++/CoderInfo.h b/....1.1-21/Magick++/lib/Magick++/CoderInfo.h → ....1.1-22/Magick++/lib/Magick++/CoderInfo.h
diff --git a/...ck-7.1.1-21/Magick++/lib/Magick++/Color.h → ...ck-7.1.1-22/Magick++/lib/Magick++/Color.h b/...ck-7.1.1-21/Magick++/lib/Magick++/Color.h → ...ck-7.1.1-22/Magick++/lib/Magick++/Color.h
diff --git a/...7.1.1-21/Magick++/lib/Magick++/Drawable.h → ...7.1.1-22/Magick++/lib/Magick++/Drawable.h b/...7.1.1-21/Magick++/lib/Magick++/Drawable.h → ...7.1.1-22/Magick++/lib/Magick++/Drawable.h
diff --git a/....1.1-21/Magick++/lib/Magick++/Exception.h → ....1.1-22/Magick++/lib/Magick++/Exception.h b/....1.1-21/Magick++/lib/Magick++/Exception.h → ....1.1-22/Magick++/lib/Magick++/Exception.h
diff --git a/....1.1-21/Magick++/lib/Magick++/Functions.h → ....1.1-22/Magick++/lib/Magick++/Functions.h b/....1.1-21/Magick++/lib/Magick++/Functions.h → ....1.1-22/Magick++/lib/Magick++/Functions.h
diff --git a/...7.1.1-21/Magick++/lib/Magick++/Geometry.h → ...7.1.1-22/Magick++/lib/Magick++/Geometry.h b/...7.1.1-21/Magick++/lib/Magick++/Geometry.h → ...7.1.1-22/Magick++/lib/Magick++/Geometry.h
diff --git a/...ck-7.1.1-21/Magick++/lib/Magick++/Image.h → ...ck-7.1.1-22/Magick++/lib/Magick++/Image.h b/...ck-7.1.1-21/Magick++/lib/Magick++/Image.h → ...ck-7.1.1-22/Magick++/lib/Magick++/Image.h
diff --git a/...7.1.1-21/Magick++/lib/Magick++/ImageRef.h → ...7.1.1-22/Magick++/lib/Magick++/ImageRef.h b/...7.1.1-21/Magick++/lib/Magick++/ImageRef.h → ...7.1.1-22/Magick++/lib/Magick++/ImageRef.h
diff --git a/...-7.1.1-21/Magick++/lib/Magick++/Include.h → ...-7.1.1-22/Magick++/lib/Magick++/Include.h b/...-7.1.1-21/Magick++/lib/Magick++/Include.h → ...-7.1.1-22/Magick++/lib/Magick++/Include.h
diff --git a/...-7.1.1-21/Magick++/lib/Magick++/Montage.h → ...-7.1.1-22/Magick++/lib/Magick++/Montage.h b/...-7.1.1-21/Magick++/lib/Magick++/Montage.h → ...-7.1.1-22/Magick++/lib/Magick++/Montage.h
diff --git a/...-7.1.1-21/Magick++/lib/Magick++/Options.h → ...-7.1.1-22/Magick++/lib/Magick++/Options.h b/...-7.1.1-21/Magick++/lib/Magick++/Options.h → ...-7.1.1-22/Magick++/lib/Magick++/Options.h
diff --git a/...k-7.1.1-21/Magick++/lib/Magick++/Pixels.h → ...k-7.1.1-22/Magick++/lib/Magick++/Pixels.h b/...k-7.1.1-21/Magick++/lib/Magick++/Pixels.h → ...k-7.1.1-22/Magick++/lib/Magick++/Pixels.h
diff --git a/...21/Magick++/lib/Magick++/ResourceLimits.h → ...22/Magick++/lib/Magick++/ResourceLimits.h b/...21/Magick++/lib/Magick++/ResourceLimits.h → ...22/Magick++/lib/Magick++/ResourceLimits.h
diff --git a/...gick-7.1.1-21/Magick++/lib/Magick++/STL.h → ...gick-7.1.1-22/Magick++/lib/Magick++/STL.h b/...gick-7.1.1-21/Magick++/lib/Magick++/STL.h → ...gick-7.1.1-22/Magick++/lib/Magick++/STL.h
diff --git a/...21/Magick++/lib/Magick++/SecurityPolicy.h → ...22/Magick++/lib/Magick++/SecurityPolicy.h b/...21/Magick++/lib/Magick++/SecurityPolicy.h → ...22/Magick++/lib/Magick++/SecurityPolicy.h
diff --git a/....1.1-21/Magick++/lib/Magick++/Statistic.h → ....1.1-22/Magick++/lib/Magick++/Statistic.h b/....1.1-21/Magick++/lib/Magick++/Statistic.h → ....1.1-22/Magick++/lib/Magick++/Statistic.h
diff --git a/...k-7.1.1-21/Magick++/lib/Magick++/Thread.h → ...k-7.1.1-22/Magick++/lib/Magick++/Thread.h b/...k-7.1.1-21/Magick++/lib/Magick++/Thread.h → ...k-7.1.1-22/Magick++/lib/Magick++/Thread.h
diff --git a/...1.1-21/Magick++/lib/Magick++/TypeMetric.h → ...1.1-22/Magick++/lib/Magick++/TypeMetric.h b/...1.1-21/Magick++/lib/Magick++/TypeMetric.h → ...1.1-22/Magick++/lib/Magick++/TypeMetric.h
diff --git a/...eMagick-7.1.1-21/Magick++/lib/Montage.cpp → ...eMagick-7.1.1-22/Magick++/lib/Montage.cpp b/...eMagick-7.1.1-21/Magick++/lib/Montage.cpp → ...eMagick-7.1.1-22/Magick++/lib/Montage.cpp
diff --git a/...eMagick-7.1.1-21/Magick++/lib/Options.cpp → ...eMagick-7.1.1-22/Magick++/lib/Options.cpp b/...eMagick-7.1.1-21/Magick++/lib/Options.cpp → ...eMagick-7.1.1-22/Magick++/lib/Options.cpp
diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Pixels.cpp → ImageMagick-7.1.1-22/Magick++/lib/Pixels.cpp b/ImageMagick-7.1.1-21/Magick++/lib/Pixels.cpp → ImageMagick-7.1.1-22/Magick++/lib/Pixels.cpp
diff --git a/...-7.1.1-21/Magick++/lib/ResourceLimits.cpp → ...-7.1.1-22/Magick++/lib/ResourceLimits.cpp b/...-7.1.1-21/Magick++/lib/ResourceLimits.cpp → ...-7.1.1-22/Magick++/lib/ResourceLimits.cpp
diff --git a/ImageMagick-7.1.1-21/Magick++/lib/STL.cpp → ImageMagick-7.1.1-22/Magick++/lib/STL.cpp b/ImageMagick-7.1.1-21/Magick++/lib/STL.cpp → ImageMagick-7.1.1-22/Magick++/lib/STL.cpp
diff --git a/...-7.1.1-21/Magick++/lib/SecurityPolicy.cpp → ...-7.1.1-22/Magick++/lib/SecurityPolicy.cpp b/...-7.1.1-21/Magick++/lib/SecurityPolicy.cpp → ...-7.1.1-22/Magick++/lib/SecurityPolicy.cpp
diff --git a/...agick-7.1.1-21/Magick++/lib/Statistic.cpp → ...agick-7.1.1-22/Magick++/lib/Statistic.cpp b/...agick-7.1.1-21/Magick++/lib/Statistic.cpp → ...agick-7.1.1-22/Magick++/lib/Statistic.cpp
diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Thread.cpp → ImageMagick-7.1.1-22/Magick++/lib/Thread.cpp b/ImageMagick-7.1.1-21/Magick++/lib/Thread.cpp → ImageMagick-7.1.1-22/Magick++/lib/Thread.cpp
diff --git a/...gick-7.1.1-21/Magick++/lib/TypeMetric.cpp → ...gick-7.1.1-22/Magick++/lib/TypeMetric.cpp b/...gick-7.1.1-21/Magick++/lib/TypeMetric.cpp → ...gick-7.1.1-22/Magick++/lib/TypeMetric.cpp
diff --git a/ImageMagick-7.1.1-21/MagickCore/MagickCore.h → ImageMagick-7.1.1-22/MagickCore/MagickCore.h b/ImageMagick-7.1.1-21/MagickCore/MagickCore.h → ImageMagick-7.1.1-22/MagickCore/MagickCore.h
diff --git a/...1/MagickCore/accelerate-kernels-private.h → ...2/MagickCore/accelerate-kernels-private.h b/...1/MagickCore/accelerate-kernels-private.h → ...2/MagickCore/accelerate-kernels-private.h
diff --git a/...-7.1.1-21/MagickCore/accelerate-private.h → ...-7.1.1-22/MagickCore/accelerate-private.h b/...-7.1.1-21/MagickCore/accelerate-private.h → ...-7.1.1-22/MagickCore/accelerate-private.h
diff --git a/ImageMagick-7.1.1-21/MagickCore/accelerate.c → ImageMagick-7.1.1-22/MagickCore/accelerate.c b/ImageMagick-7.1.1-21/MagickCore/accelerate.c → ImageMagick-7.1.1-22/MagickCore/accelerate.c
diff --git a/...ick-7.1.1-21/MagickCore/animate-private.h → ...ick-7.1.1-22/MagickCore/animate-private.h b/...ick-7.1.1-21/MagickCore/animate-private.h → ...ick-7.1.1-22/MagickCore/animate-private.h
diff --git a/ImageMagick-7.1.1-21/MagickCore/animate.c → ImageMagick-7.1.1-22/MagickCore/animate.c b/ImageMagick-7.1.1-21/MagickCore/animate.c → ImageMagick-7.1.1-22/MagickCore/animate.c
@@ -229,7 +229,7 @@ typedef enum
   StepBackwardCommand,
   StepForwardCommand,
   NullCommand
-} CommandType;
+} AnimateCommand;
 
 /*
   Stipples.
@@ -243,7 +243,7 @@ typedef enum
   Forward declarations.
 */
 static Image
-  *XMagickCommand(Display *,XResourceInfo *,XWindows *,const CommandType,
+  *XMagickCommand(Display *,XResourceInfo *,XWindows *,const AnimateCommand,
     Image **,MagickStatusType *,ExceptionInfo *);
 
 static MagickBooleanType
@@ -346,7 +346,7 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info,
 %  The format of the XMagickCommand method is:
 %
 %      Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
-%        XWindows *windows,const CommandType command_type,Image **image,
+%        XWindows *windows,const AnimateCommand animate_command,Image **image,
 %        MagickStatusType *state,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -369,7 +369,7 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info,
 %
 */
 static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
-  XWindows *windows,const CommandType command_type,Image **image,
+  XWindows *windows,const AnimateCommand animate_command,Image **image,
   MagickStatusType *state,ExceptionInfo *exception)
 {
   Image
@@ -388,7 +388,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
     Process user command.
   */
   nexus=NewImageList();
-  switch (command_type)
+  switch (animate_command)
   {
     case OpenCommand:
     {
@@ -519,9 +519,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
     {
       *state|=StepAnimationState;
       *state&=(~PlayAnimationState);
-      if (command_type == StepBackwardCommand)
+      if (animate_command == StepBackwardCommand)
         *state&=(~ForwardAnimationState);
-      if (command_type == StepForwardCommand)
+      if (animate_command == StepForwardCommand)
         *state|=ForwardAnimationState;
       break;
     }
@@ -1262,7 +1262,7 @@ MagickExport Image *XAnimateImages(Display *display,
       HelpMenu
     };
 
-  static const CommandType
+  static const AnimateCommand
     CommandMenus[]=
     {
       NullCommand,
@@ -1272,7 +1272,7 @@ MagickExport Image *XAnimateImages(Display *display,
       InfoCommand,
       QuitCommand
     },
-    CommandTypes[]=
+    AnimateCommands[]=
     {
       OpenCommand,
       PlayCommand,
@@ -1298,25 +1298,25 @@ MagickExport Image *XAnimateImages(Display *display,
       VersionCommand
     };
 
-  static const CommandType
+  static const AnimateCommand
     *Commands[MagickMenus]=
     {
-      CommandTypes,
+      AnimateCommands,
       SpeedCommands,
       DirectionCommands,
       HelpCommands
     };
 
+  AnimateCommand
+    animate_command;
+
   char
     command[MagickPathExtent],
     *directory,
     geometry[MagickPathExtent],
     *p,
     resource_name[MagickPathExtent];
 
-  CommandType
-    command_type;
-
   Image
     *coalesce_image,
     *display_image,
@@ -2197,7 +2197,7 @@ MagickExport Image *XAnimateImages(Display *display,
         if (id < 0)
           continue;
         (void) CopyMagickString(command,CommandMenu[id],MagickPathExtent);
-        command_type=CommandMenus[id];
+        animate_command=CommandMenus[id];
         if (id < MagickMenus)
           {
             int
@@ -2211,11 +2211,11 @@ MagickExport Image *XAnimateImages(Display *display,
             if (entry < 0)
               continue;
             (void) CopyMagickString(command,Menus[id][entry],MagickPathExtent);
-            command_type=Commands[id][entry];
+            animate_command=Commands[id][entry];
           }
-        if (command_type != NullCommand)
-          nexus=XMagickCommand(display,resource_info,windows,
-            command_type,&image,&state,exception);
+        if (animate_command != NullCommand)
+          nexus=XMagickCommand(display,resource_info,windows,animate_command,
+            &image,&state,exception);
         continue;
       }
     switch (event.type)
@@ -2527,63 +2527,63 @@ MagickExport Image *XAnimateImages(Display *display,
         if (resource_info->debug != MagickFalse)
           (void) LogMagickEvent(X11Event,GetMagickModule(),
             "Key press: 0x%lx (%c)",(unsigned long) key_symbol,*command);
-        command_type=NullCommand;
+        animate_command=NullCommand;
         switch (key_symbol)
         {
           case XK_o:
           {
             if ((event.xkey.state & ControlMask) == MagickFalse)
               break;
-            command_type=OpenCommand;
+            animate_command=OpenCommand;
             break;
           }
           case XK_BackSpace:
           {
-            command_type=StepBackwardCommand;
+            animate_command=StepBackwardCommand;
             break;
           }
           case XK_space:
           {
-            command_type=StepForwardCommand;
+            animate_command=StepForwardCommand;
             break;
           }
           case XK_less:
           {
-            command_type=FasterCommand;
+            animate_command=FasterCommand;
             break;
           }
           case XK_greater:
           {
-            command_type=SlowerCommand;
+            animate_command=SlowerCommand;
             break;
           }
           case XK_F1:
           {
-            command_type=HelpCommand;
+            animate_command=HelpCommand;
             break;
           }
           case XK_Find:
           {
-            command_type=BrowseDocumentationCommand;
+            animate_command=BrowseDocumentationCommand;
             break;
           }
           case XK_question:
           {
-            command_type=InfoCommand;
+            animate_command=InfoCommand;
             break;
           }
           case XK_q:
           case XK_Escape:
           {
-            command_type=QuitCommand;
+            animate_command=QuitCommand;
             break;
           }
           default:
             break;
         }
-        if (command_type != NullCommand)
+        if (animate_command != NullCommand)
           nexus=XMagickCommand(display,resource_info,windows,
-            command_type,&image,&state,exception);
+            animate_command,&image,&state,exception);
         break;
       }
       case KeyRelease:

diff --git a/ImageMagick-7.1.1-21/MagickCore/animate.h → ImageMagick-7.1.1-22/MagickCore/animate.h b/ImageMagick-7.1.1-21/MagickCore/animate.h → ImageMagick-7.1.1-22/MagickCore/animate.h
diff --git a/...ck-7.1.1-21/MagickCore/annotate-private.h → ...ck-7.1.1-22/MagickCore/annotate-private.h b/...ck-7.1.1-21/MagickCore/annotate-private.h → ...ck-7.1.1-22/MagickCore/annotate-private.h
diff --git a/ImageMagick-7.1.1-21/MagickCore/annotate.c → ImageMagick-7.1.1-22/MagickCore/annotate.c b/ImageMagick-7.1.1-21/MagickCore/annotate.c → ImageMagick-7.1.1-22/MagickCore/annotate.c
diff --git a/ImageMagick-7.1.1-21/MagickCore/annotate.h → ImageMagick-7.1.1-22/MagickCore/annotate.h b/ImageMagick-7.1.1-21/MagickCore/annotate.h → ImageMagick-7.1.1-22/MagickCore/annotate.h
diff --git a/ImageMagick-7.1.1-21/MagickCore/artifact.c → ImageMagick-7.1.1-22/MagickCore/artifact.c b/ImageMagick-7.1.1-21/MagickCore/artifact.c → ImageMagick-7.1.1-22/MagickCore/artifact.c
diff --git a/ImageMagick-7.1.1-21/MagickCore/artifact.h → ImageMagick-7.1.1-22/MagickCore/artifact.h b/ImageMagick-7.1.1-21/MagickCore/artifact.h → ImageMagick-7.1.1-22/MagickCore/artifact.h
diff --git a/ImageMagick-7.1.1-21/MagickCore/attribute.c → ImageMagick-7.1.1-22/MagickCore/attribute.c b/ImageMagick-7.1.1-21/MagickCore/attribute.c → ImageMagick-7.1.1-22/MagickCore/attribute.c
@@ -17,7 +17,7 @@
 %                                October 2002                                 %
 %                                                                             %
 %                                                                             %
-%  Copyright @ 2002 ImageMagick Studio LLC, a non-profit organization         %
+%  Copyright @ 1999 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  %
@@ -124,14 +124,14 @@
 %
 */
 
-typedef struct _EdgeInfo
+typedef struct _CensusInfo
 {
   double
     left,
     right,
     top,
     bottom;
-} EdgeInfo;
+} CensusInfo;
 
 static double GetEdgeBackgroundCensus(const Image *image,
   const CacheView *image_view,const GravityType gravity,const size_t width,
@@ -238,7 +238,7 @@ static double GetEdgeBackgroundCensus(const Image *image,
   return(census);
 }
 
-static inline double GetMinEdgeBackgroundCensus(const EdgeInfo *edge)
+static inline double GetMinEdgeBackgroundCensus(const CensusInfo *edge)
 {
   double
     census;
@@ -254,17 +254,17 @@ static RectangleInfo GetEdgeBoundingBox(const Image *image,
   CacheView
     *edge_view;
 
+  CensusInfo
+    edge,
+    vertex;
+
   const char
     *artifact;
 
   double
     background_census,
     percent_background;
 
-  EdgeInfo
-    edge,
-    vertex;
-
   Image
     *edge_image;
 

diff --git a/ImageMagick-7.1.1-21/MagickCore/attribute.h → ImageMagick-7.1.1-22/MagickCore/attribute.h b/ImageMagick-7.1.1-21/MagickCore/attribute.h → ImageMagick-7.1.1-22/MagickCore/attribute.h
diff --git a/...Magick-7.1.1-21/MagickCore/blob-private.h → ...Magick-7.1.1-22/MagickCore/blob-private.h b/...Magick-7.1.1-21/MagickCore/blob-private.h → ...Magick-7.1.1-22/MagickCore/blob-private.h