Update ImageMagick from 7.1.0-35 -> 7.1.0-36

Author: web-flow

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.0-35
+IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.0-36
 IMAGE_MAGICK                    := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR)
 
 JPEG_LIB_PATH                   := $(LOCAL_PATH)/libjpeg-turbo-2.0.2

ImageMagick-7.1.0-35/Magick++/lib/Blob.cpp ImageMagick-7.1.0-36/Magick++/lib/Blob.cpp

@@ -137,24 +137,24 @@ namespace MagickCore
 #        endif
 #        if defined(MAGICKCORE_HEIC_DELEGATE)
 #          pragma comment(lib, "CORE_DB_aom_.lib")
-#          pragma comment(lib, "CORE_DB_libde265_.lib")
-#          pragma comment(lib, "CORE_DB_libheif_.lib")
+#          pragma comment(lib, "CORE_DB_de265_.lib")
+#          pragma comment(lib, "CORE_DB_heif_.lib")
 #        endif
 #        if defined(MAGICKCORE_LZMA_DELEGATE)
-#          pragma comment(lib, "CORE_DB_liblzma_.lib")
+#          pragma comment(lib, "CORE_DB_lzma_.lib")
 #        endif
 #        if defined(MAGICKCORE_RAW_R_DELEGATE)
-#          pragma comment(lib, "CORE_DB_libraw_.lib")
+#          pragma comment(lib, "CORE_DB_raw_.lib")
 #        endif
 #        if defined(MAGICKCORE_RSVG_DELEGATE)
 #          pragma comment(lib, "CORE_DB_croco_.lib")
-#          pragma comment(lib, "CORE_DB_librsvg_.lib")
+#          pragma comment(lib, "CORE_DB_rsvg_.lib")
 #        endif
 #        if defined(MAGICKCORE_XML_DELEGATE)
-#          pragma comment(lib, "CORE_DB_libxml_.lib")
+#          pragma comment(lib, "CORE_DB_xml_.lib")
 #        endif
 #        if defined(MAGICKCORE_ZIP_DELEGATE)
-#          pragma comment(lib, "CORE_DB_libzip_.lib")
+#          pragma comment(lib, "CORE_DB_zip_.lib")
 #        endif
 #        if defined(MAGICKCORE_LQR_DELEGATE)
 #          pragma comment(lib, "CORE_DB_ffi_.lib")
@@ -226,24 +226,24 @@ namespace MagickCore
 #        endif
 #        if defined(MAGICKCORE_HEIC_DELEGATE)
 #          pragma comment(lib, "CORE_RL_aom_.lib")
-#          pragma comment(lib, "CORE_RL_libde265_.lib")
-#          pragma comment(lib, "CORE_RL_libheif_.lib")
+#          pragma comment(lib, "CORE_RL_de265_.lib")
+#          pragma comment(lib, "CORE_RL_heif_.lib")
 #        endif
 #        if defined(MAGICKCORE_LZMA_DELEGATE)
-#          pragma comment(lib, "CORE_RL_liblzma_.lib")
+#          pragma comment(lib, "CORE_RL_lzma_.lib")
 #        endif
 #        if defined(MAGICKCORE_RAW_R_DELEGATE)
-#          pragma comment(lib, "CORE_RL_libraw_.lib")
+#          pragma comment(lib, "CORE_RL_raw_.lib")
 #        endif
 #        if defined(MAGICKCORE_RSVG_DELEGATE)
 #          pragma comment(lib, "CORE_RL_croco_.lib")
-#          pragma comment(lib, "CORE_RL_librsvg_.lib")
+#          pragma comment(lib, "CORE_RL_rsvg_.lib")
 #        endif
 #        if defined(MAGICKCORE_XML_DELEGATE)
-#          pragma comment(lib, "CORE_RL_libxml_.lib")
+#          pragma comment(lib, "CORE_RL_xml_.lib")
 #        endif
 #        if defined(MAGICKCORE_ZIP_DELEGATE)
-#          pragma comment(lib, "CORE_RL_libzip_.lib")
+#          pragma comment(lib, "CORE_RL_zip_.lib")
 #        endif
 #        if defined(MAGICKCORE_LQR_DELEGATE)
 #          pragma comment(lib, "CORE_RL_ffi_.lib")

ImageMagick-7.1.0-35/Magick++/lib/BlobRef.cpp ImageMagick-7.1.0-36/Magick++/lib/BlobRef.cpp

@@ -196,6 +196,7 @@
 #include "MagickCore/monitor-private.h"
 #include "MagickCore/option.h"
 #include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
 #include "MagickCore/quantize.h"
 #include "MagickCore/quantum.h"
 #include "MagickCore/quantum-private.h"
@@ -2380,6 +2381,17 @@ static KmeansInfo **DestroyKmeansTLS(KmeansInfo **kmeans_info)
   return(kmeans_info);
 }
 
+static int DominantColorCompare(const void *x,const void *y)
+{
+  PixelInfo
+    *pixel_1,
+    *pixel_2;
+
+  pixel_1=(PixelInfo *) x;
+  pixel_2=(PixelInfo *) y;
+  return((int) pixel_2->count-(int) pixel_1->count);
+}
+
 static KmeansInfo **AcquireKmeansTLS(const size_t number_colors)
 {
   KmeansInfo
@@ -2461,12 +2473,18 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
   CacheView
     *image_view;
 
+  char
+    tuple[MagickPathExtent];
+
   const char
     *colors;
 
   double
     previous_tolerance;
 
+  Image
+    *dominant_image;
+
   KmeansInfo
     **kmeans_pixels;
 
@@ -2475,9 +2493,11 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
     status;
 
   size_t
-    n,
     number_threads;
 
+  ssize_t
+    n;
+
   assert(image != (Image *) NULL);
   assert(image->signature == MagickCoreSignature);
   assert(exception != (ExceptionInfo *) NULL);
@@ -2505,7 +2525,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
       quantize_info->colorspace=image->colorspace;
       quantize_info->number_colors=number_colors;
       quantize_info->dither_method=NoDitherMethod;
-      n=number_colors;
+      n=(ssize_t) number_colors;
       for (depth=1; n != 0; depth++)
         n>>=2;
       cube_info=GetCubeInfo(quantize_info,depth,number_colors);
@@ -2541,7 +2561,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
       status=AcquireImageColormap(image,number_colors,exception);
       if (status == MagickFalse)
         return(status);
-      for (n=0, p=colors; n < image->colors; n++)
+      for (n=0, p=colors; n < (ssize_t) image->colors; n++)
       {
         const char
           *q;
@@ -2560,7 +2580,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
           }
         p=q+1;
       }
-      if (n < image->colors)
+      if (n < (ssize_t) image->colors)
         {
           RandomInfo
             *random_info;
@@ -2569,7 +2589,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
             Seed clusters from random values.
           */
           random_info=AcquireRandomInfo();
-          for ( ; n < image->colors; n++)
+          for ( ; n < (ssize_t) image->colors; n++)
           {
             (void) QueryColorCompliance("#000",AllCompliance,image->colormap+n,
               exception);
@@ -2592,10 +2612,10 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);
   previous_tolerance=0.0;
-  verbose=IsStringTrue(GetImageArtifact(image,"debug"));
+  verbose=IsStringTrue(GetImageArtifact(image,"verbose"));
   number_threads=(size_t) GetMagickResourceLimit(ThreadResource);
   image_view=AcquireAuthenticCacheView(image,exception);
-  for (n=0; n < max_iterations; n++)
+  for (n=0; n < (ssize_t) max_iterations; n++)
   {
     double
       distortion;
@@ -2712,12 +2732,13 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
         image->colormap[j].alpha=gamma*QuantumRange*kmeans_pixels[0][j].alpha;
       if (image->colorspace == CMYKColorspace)
         image->colormap[j].black=gamma*QuantumRange*kmeans_pixels[0][j].black;
+      image->colormap[j].count=(MagickSizeType) kmeans_pixels[0][j].count;
       distortion+=kmeans_pixels[0][j].distortion;
     }
-    if (verbose != MagickFalse)
-      (void) FormatLocaleFile(stderr,"distortion[%.20g]: %*g %*g\n",(double) n,
-        GetMagickPrecision(),distortion,GetMagickPrecision(),
-        fabs(distortion-previous_tolerance));
+    if (image->debug != MagickFalse)
+      (void) LogMagickEvent(ImageEvent,GetMagickModule(),
+        "distortion[%.20g]: %*g %*g\n",(double) n,GetMagickPrecision(),
+        distortion,GetMagickPrecision(),fabs(distortion-previous_tolerance));
     if (fabs(distortion-previous_tolerance) <= tolerance)
       break;
     previous_tolerance=distortion;
@@ -2733,6 +2754,25 @@ MagickExport MagickBooleanType KmeansImage(Image *image,
       }
   }
   image_view=DestroyCacheView(image_view);
+  if (verbose != MagickFalse)
+    for (n=0; n < (ssize_t) image->colors; n++)
+    {
+      GetColorTuple(image->colormap+n,MagickTrue,tuple);
+      (void) FormatLocaleFile(stderr,"%s %.20g\n",tuple,(double)
+        image->colormap[n].count);
+    }
+  dominant_image=CloneImage(image,0,0,MagickTrue,exception);
+  if (dominant_image != (Image *) NULL)
+    {
+      /*
+        Note dominant color.
+      */
+      qsort((void *) dominant_image->colormap,dominant_image->colors,
+        sizeof(*dominant_image->colormap),DominantColorCompare);
+      GetColorTuple(dominant_image->colormap,MagickTrue,tuple);
+      dominant_image=DestroyImage(dominant_image);
+      (void) SetImageProperty(image,"dominant-color",tuple,exception);
+    }
   kmeans_pixels=DestroyKmeansTLS(kmeans_pixels);
   if (image->progress_monitor != (MagickProgressMonitor) NULL)
     (void) SetImageProgress(image,KmeansImageTag,(MagickOffsetType)