...

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 83a095ee39b0aa08739bbead34ed912412f50a8e..ad0f41201ee54f40ea82af6e303a1b99cfdb58b6 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1328,7 +1328,7 @@ static MagickBooleanType DrawBoundingRectangles(Image *image,
   DrawInfo
     *clone_info;
 
-  MagickBooleanType
+  MagickStatusType
     status;
 
   PointInfo
@@ -1355,7 +1355,7 @@ static MagickBooleanType DrawBoundingRectangles(Image *image,
   if (status == MagickFalse)
     {
       clone_info=DestroyDrawInfo(clone_info);
-      return(status);
+      return(MagickFalse);
     }
   resolution.x=96.0;
   resolution.y=96.0;
@@ -1431,7 +1431,7 @@ static MagickBooleanType DrawBoundingRectangles(Image *image,
       if (i < (ssize_t) polygon_info->number_edges)
         {
           clone_info=DestroyDrawInfo(clone_info);
-          return(status);
+          return(status == 0 ? MagickFalse : MagickTrue);
         }
     }
   status=QueryColorCompliance("#00f",AllCompliance,&clone_info->stroke,
@@ -1439,7 +1439,7 @@ static MagickBooleanType DrawBoundingRectangles(Image *image,
   if (status == MagickFalse)
     {
       clone_info=DestroyDrawInfo(clone_info);
-      return(status);
+      return(MagickFalse);
     }
   start.x=(double) (bounds.x1-mid);
   start.y=(double) (bounds.y1-mid);
@@ -1452,7 +1452,7 @@ static MagickBooleanType DrawBoundingRectangles(Image *image,
   primitive_info[coordinates].primitive=UndefinedPrimitive;
   status=DrawPrimitive(image,clone_info,primitive_info,exception);
   clone_info=DestroyDrawInfo(clone_info);
-  return(status);
+  return(status == 0 ? MagickFalse : MagickTrue);
 }
 \f
 /*
@@ -2251,8 +2251,8 @@ static MagickBooleanType CheckPrimitiveExtent(MVGInfo *mvg_info,
     {
       if (extent <= (double) *mvg_info->extent)
         return(MagickTrue);
-      *mvg_info->primitive_info=ResizeQuantumMemory(*mvg_info->primitive_info,
-        (size_t) extent,quantum);
+      *mvg_info->primitive_info=(PrimitiveInfo *) ResizeQuantumMemory(
+        *mvg_info->primitive_info,(size_t) extent,quantum);
       if (*mvg_info->primitive_info != (PrimitiveInfo *) NULL)
         {
           *mvg_info->extent=(size_t) extent;
@@ -2267,7 +2267,8 @@ static MagickBooleanType CheckPrimitiveExtent(MVGInfo *mvg_info,
   if (*mvg_info->primitive_info != (PrimitiveInfo *) NULL)
     *mvg_info->primitive_info=(PrimitiveInfo *) RelinquishMagickMemory(
       *mvg_info->primitive_info);
-  *mvg_info->primitive_info=AcquireCriticalMemory(PrimitiveExtentPad*quantum);
+  *mvg_info->primitive_info=(PrimitiveInfo *) AcquireCriticalMemory(
+    PrimitiveExtentPad*quantum);
   (void) memset(*mvg_info->primitive_info,0,PrimitiveExtentPad*quantum);
   *mvg_info->extent=1;
   return(MagickFalse);
@@ -2485,7 +2486,7 @@ static MagickBooleanType RenderMVGContent(Image *image,
     {
       status=SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       if (status == MagickFalse)
-        return(status);
+        return(status == 0 ? MagickFalse : MagickTrue);
     }
   primitive=(char *) NULL;
   if (*draw_info->primitive != '@')
@@ -5912,7 +5913,7 @@ static MagickBooleanType TraceArcPath(MVGInfo *mvg_info,const PointInfo start,
     gamma,
     theta;
 
-  MagickBooleanType
+  MagickStatusType
     status;
 
   PointInfo
@@ -6040,7 +6041,7 @@ static MagickBooleanType TraceArcPath(MVGInfo *mvg_info,const PointInfo start,
     p->primitive=primitive_info->primitive;
     p--;
   }
-  return(status);
+  return(status == 0 ? MagickFalse : MagickTrue);
 }
 
 static MagickBooleanType TraceBezier(MVGInfo *mvg_info,

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index d0ea04f51a35626e68ed7c60432d6395fc21bde6..0538f842fb36af070f67199cf063def55eca6c91 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -602,7 +602,7 @@ static MagickBooleanType CLAHE(const size_t width,const size_t height,
     }
     p+=width*(tile.height-1);
   }
-  buffer=RelinquishMagickMemory(buffer);
+  buffer=(size_t *) RelinquishMagickMemory(buffer);
   return(MagickTrue);
 }
 

diff --git a/MagickCore/monitor.c b/MagickCore/monitor.c
index b54fc61f0c64a416ed138501e0166d5bb442b7e2..a74e2ff71b5802148c9170ef2c60eaf1a4423d0f 100644 (file)
--- a/MagickCore/monitor.c
+++ b/MagickCore/monitor.c
@@ -44,6 +44,7 @@
 #include "MagickCore/image.h"
 #include "MagickCore/log.h"
 #include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
 \f
 /*
   Static declarations.

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 67343da9b8886c530339e81bc7cd8057792bfe75..75ab4d5604c578430b638ebce21564c22ec48a4b 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -3767,8 +3767,8 @@ RestoreMSCWarning
             FX - value calculator.
           */
           fx_info=AcquireFxInfo(property_image,pattern+3,exception);
-          status=FxEvaluateChannelExpression(fx_info,DefaultChannels,0,0,&value,
-            exception);
+          status=FxEvaluateChannelExpression(fx_info,CompositePixelChannel,0,0,
+            &value,exception);
           fx_info=DestroyFxInfo(fx_info);
           if (status != MagickFalse)
             {

diff --git a/configure b/configure
index e75de26fc194239e662376988672d831ad2fb44b..6f899ddb8acc904627a8c412e81daecf4b2c9ff7 100755 (executable)
--- a/configure
+++ b/configure
@@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=15
 
 MAGICK_VERSION=7.0.8-15
 
-MAGICK_GIT_REVISION=14965:3a037126f:20181110
+MAGICK_GIT_REVISION=15016:55a7a6ac4:20181124
 
 
 # Substitute library versioning