Update ImageMagick from 7.1.1-15 -> 7.1.1-16

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-15
+IMAGE_MAGICK_BASEDIR            := ImageMagick-7.1.1-16
 IMAGE_MAGICK                    := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR)
 
 JPEG_LIB_PATH                   := $(LOCAL_PATH)/libjpeg-turbo-2.0.2

ImageMagick-7.1.1-15/Magick++/lib/Color.cpp → ImageMagick-7.1.1-16/Magick++/lib/Color.cpp

@@ -24,9 +24,9 @@ MagickPPExport int Magick::operator == (const Magick::Color &left_,
 {
 #if defined(MAGICKCORE_HDRI_SUPPORT)
   return((left_.isValid() == right_.isValid()) &&
-    (fabs(left_.quantumRed()-right_.quantumRed()) < MagickEpsilon) &&
-    (fabs(left_.quantumGreen()-right_.quantumGreen()) < MagickEpsilon) &&
-    (fabs(left_.quantumBlue()-right_.quantumBlue()) < MagickEpsilon));
+    (fabs((double) left_.quantumRed()-(double) right_.quantumRed()) < MagickEpsilon) &&
+    (fabs((double) left_.quantumGreen()-(double) right_.quantumGreen()) < MagickEpsilon) &&
+    (fabs((double) left_.quantumBlue()-(double) right_.quantumBlue()) < MagickEpsilon));
 #else
   return((left_.isValid() == right_.isValid()) &&
     (left_.quantumRed() == right_.quantumRed()) &&
@@ -399,13 +399,13 @@ void Magick::Color::pixel(PixelInfo *rep_,PixelType pixelType_)
 
 Magick::Quantum Magick::Color::scaleDoubleToQuantum(const double double_)
 {
-  return(static_cast<Magick::Quantum>(double_*QuantumRange));
+  return(static_cast<Magick::Quantum>(double_*(double) QuantumRange));
 }
 
 double Magick::Color::scaleQuantumToDouble(const Magick::Quantum quantum_)
 {
 #if (MAGICKCORE_QUANTUM_DEPTH < 32) && (MAGICKCORE_SIZEOF_FLOAT_T != MAGICKCORE_SIZEOF_DOUBLE || !defined(MAGICKCORE_HDRI_SUPPORT))
-  return(static_cast<double>(QuantumScale*quantum_));
+  return(static_cast<double>(QuantumScale*(double) quantum_));
 #else
   return(QuantumScale*quantum_);
 #endif
@@ -891,8 +891,8 @@ void Magick::ColorYUV::u(const double u_)
 
 double Magick::ColorYUV::u(void) const
 {
-  return(scaleQuantumToDouble((-0.14740 * quantumRed()) - (0.28950 *
-    quantumGreen()) + (0.43690 * quantumBlue())));
+  return(scaleQuantumToDouble((-0.14740 * (double) quantumRed()) - (0.28950 *
+    (double) quantumGreen()) + (0.43690 * (double) quantumBlue())));
 }
 
 void Magick::ColorYUV::v(const double v_)
@@ -902,8 +902,8 @@ void Magick::ColorYUV::v(const double v_)
 
 double Magick::ColorYUV::v(void) const
 {
-  return(scaleQuantumToDouble((0.61500 * quantumRed()) - (0.51500 *
-    quantumGreen()) - (0.10000 * quantumBlue())));
+  return(scaleQuantumToDouble((0.61500 * (double) quantumRed()) - (0.51500 *
+    (double) quantumGreen()) - (0.10000 * (double) quantumBlue())));
 }
 
 void Magick::ColorYUV::y(const double y_)
@@ -913,8 +913,8 @@ void Magick::ColorYUV::y(const double y_)
 
 double Magick::ColorYUV::y ( void ) const
 {
-  return(scaleQuantumToDouble((0.29900 * quantumRed()) + (0.58700 *
-    quantumGreen()) + (0.11400 * quantumBlue())));
+  return(scaleQuantumToDouble((0.29900 * (double) quantumRed()) + (0.58700 *
+    (double) quantumGreen()) + (0.11400 * (double) quantumBlue())));
 }
 
 void Magick::ColorYUV::convert(const double y_,const double u_,const double v_)

ImageMagick-7.1.1-15/Magick++/lib/Image.cpp → ImageMagick-7.1.1-16/Magick++/lib/Image.cpp

@@ -764,7 +764,7 @@ void Magick::Image::fileName(const std::string &fileName_)
   modifyImage();
 
   max_length=sizeof(image()->filename)-1;
-  fileName_.copy(image()->filename,max_length);
+  fileName_.copy(image()->filename,(size_t) max_length);
   if ((ssize_t) fileName_.length() > max_length)
     image()->filename[max_length]=0;
   else
@@ -4210,14 +4210,13 @@ void Magick::Image::roll(const Geometry &roll_)
   ThrowImageException;
 }
 
-void Magick::Image::roll(const size_t columns_,const size_t rows_)
+void Magick::Image::roll(const ssize_t columns_,const ssize_t rows_)
 {
   MagickCore::Image
     *newImage;
 
   GetPPException;
-  newImage=RollImage(constImage(),static_cast<ssize_t>(columns_),
-    static_cast<ssize_t>(rows_),exceptionInfo);
+  newImage=RollImage(constImage(),columns_, rows_,exceptionInfo);
   replaceImage(newImage);
   ThrowImageException;
 }

ImageMagick-7.1.1-15/Magick++/lib/ImageRef.cpp → ImageMagick-7.1.1-16/Magick++/lib/ImageRef.cpp

@@ -60,7 +60,7 @@ size_t Magick::ImageRef::decrease()
         "Invalid call to decrease");
       return(0);
     }
-  count=--_refCount;
+  count=(size_t) (--_refCount);
   _mutexLock.unlock();
   return(count);
 }
@@ -154,4 +154,4 @@ Magick::ImageRef::ImageRef(MagickCore::Image *image_,const Options *options_)
     _refCount(1)
 {
   _options=new Options(*options_);
-}
+}

ImageMagick-7.1.1-15/Magick++/lib/Magick++/Image.h → ImageMagick-7.1.1-16/Magick++/lib/Magick++/Image.h

@@ -1271,7 +1271,7 @@ namespace Magick
     // Roll image (rolls image vertically and horizontally) by specified
     // number of columns and rows)
     void roll(const Geometry &roll_);
-    void roll(const size_t columns_,const size_t rows_);
+    void roll(const ssize_t columns_,const ssize_t rows_);
 
     // Rotate image clockwise by specified number of degrees. Specify a
     // negative number for degrees to rotate counter-clockwise.
@@ -1345,7 +1345,7 @@ namespace Magick
 
     // adjust the image contrast with a non-linear sigmoidal contrast algorithm
     void sigmoidalContrast(const bool sharpen_,const double contrast,
-      const double midpoint=QuantumRange/2.0);
+      const double midpoint=(double) QuantumRange/2.0);
 
     // Image signature. Set force_ to true in order to re-calculate
     // the signature regardless of whether the image data has been

ImageMagick-7.1.1-15/Magick++/lib/Magick++/Include.h → ImageMagick-7.1.1-16/Magick++/lib/Magick++/Include.h

@@ -122,7 +122,7 @@ namespace MagickCore
 #          pragma comment(lib, "CORE_DB_jbig_.lib")
 #        endif
 #        if defined(MAGICKCORE_JP2_DELEGATE)
-#          pragma comment(lib, "CORE_DB_jp2_.lib")
+#          pragma comment(lib, "CORE_DB_jasper_.lib")
 #        endif
 #        if defined(MAGICKCORE_JPEG_DELEGATE)
 #          pragma comment(lib, "CORE_DB_jpeg-turbo_.lib")
@@ -211,7 +211,7 @@ namespace MagickCore
 #          pragma comment(lib, "CORE_RL_jbig_.lib")
 #        endif
 #        if defined(MAGICKCORE_JP2_DELEGATE)
-#          pragma comment(lib, "CORE_RL_jp2_.lib")
+#          pragma comment(lib, "CORE_RL_jasper_.lib")
 #        endif
 #        if defined(MAGICKCORE_JPEG_DELEGATE)
 #          pragma comment(lib, "CORE_RL_jpeg-turbo_.lib")

ImageMagick-7.1.1-15/Magick++/lib/Magick++/STL.h → ImageMagick-7.1.1-16/Magick++/lib/Magick++/STL.h

@@ -940,8 +940,8 @@ namespace Magick
     void operator()( Image &image_ ) const;
 
   private:
-    size_t _columns;
-    size_t _rows;
+    ssize_t _columns;
+    ssize_t _rows;
   };
 
   // Rotate image counter-clockwise by specified number of degrees.
@@ -1735,7 +1735,7 @@ namespace Magick
   public:
     sigmoidalContrastImage( const size_t sharpen_,
       const double contrast,
-      const double midpoint = QuantumRange / 2.0 );
+      const double midpoint = (double) QuantumRange / 2.0 );
 
     void operator()( Image &image_ ) const;
 
@@ -1922,7 +1922,7 @@ namespace Magick
 
       current->previous=previous;
       current->next=(MagickCore::Image *) NULL;
-      current->scene=scene++;
+      current->scene=(size_t) scene++;
 
       if (previous != (MagickCore::Image *) NULL)
         previous->next=current;

ImageMagick-7.1.1-15/Magick++/lib/Options.cpp → ImageMagick-7.1.1-16/Magick++/lib/Options.cpp

@@ -229,7 +229,7 @@ void Magick::Options::fileName(const std::string &fileName_)
     max_length;
 
   max_length=sizeof(_imageInfo->filename)-1;
-  fileName_.copy(_imageInfo->filename,max_length);
+  fileName_.copy(_imageInfo->filename,(size_t) max_length);
   if ((ssize_t) fileName_.length() > max_length)
     _imageInfo->filename[max_length]=0;
   else

ImageMagick-7.1.1-15/Magick++/lib/Pixels.cpp → ImageMagick-7.1.1-16/Magick++/lib/Pixels.cpp

@@ -150,8 +150,8 @@ void Magick::PixelData::init(Magick::Image &image_,const ::ssize_t x_,
   _length=0;
   _size=0;
   if ((x_ < 0) || (width_ == 0) || (y_ < 0) || (height_ == 0) ||
-      (x_ > (ssize_t) image_.columns()) || ((width_ + x_) > image_.columns())
-      || (y_ > (ssize_t) image_.rows()) || ((height_ + y_) > image_.rows())
+      (x_ > (ssize_t) image_.columns()) || (((ssize_t) width_ + x_) > (ssize_t) image_.columns())
+      || (y_ > (ssize_t) image_.rows()) || (((ssize_t) height_ + y_) > (ssize_t) image_.rows())
       || (map_.length() == 0))
     return;
 
@@ -183,9 +183,9 @@ void Magick::PixelData::init(Magick::Image &image_,const ::ssize_t x_,
       return;
   }
 
-  _length=width_*height_*map_.length();
-  _size=_length*size;
-  _data=AcquireMagickMemory(_size);
+  _length=(ssize_t) (width_*height_*map_.length());
+  _size=_length*(ssize_t) size;
+  _data=AcquireMagickMemory((size_t) _size);
 
   GetPPException;
   MagickCore::ExportImagePixels(image_.image(),x_,y_,width_,height_,

ImageMagick-7.1.1-15/Magick++/lib/STL.cpp → ImageMagick-7.1.1-16/Magick++/lib/STL.cpp

@@ -890,8 +890,8 @@ void Magick::reduceNoiseImage::operator()( Image &image_ ) const
 // Roll image (rolls image vertically and horizontally) by specified
 // number of columns and rows)
 Magick::rollImage::rollImage( const Magick::Geometry &roll_ )
-  : _columns( roll_.width() ),
-    _rows( roll_.height() )
+  : _columns( static_cast<ssize_t>(roll_.width()) ),
+    _rows( static_cast<ssize_t>(roll_.height()) )
 {
 }
 Magick::rollImage::rollImage( const ssize_t columns_,

ImageMagick-7.1.1-15/Magick++/lib/Statistic.cpp → ImageMagick-7.1.1-16/Magick++/lib/Statistic.cpp

@@ -139,7 +139,7 @@ Magick::ChannelPerceptualHash::ChannelPerceptualHash(
     _srgbHuPhash(7),
     _hclpHuPhash(7)
 {
-  ssize_t
+  size_t
     i;
 
   if (hash_.length() != 70)
@@ -175,7 +175,7 @@ Magick::ChannelPerceptualHash::operator std::string() const
   std::string
     hash;
 
-  ssize_t
+  size_t
     i;
 
   if (!isValid())
@@ -230,7 +230,7 @@ double Magick::ChannelPerceptualHash::sumSquaredDifferences(
   double
     ssd;
 
-  ssize_t
+  size_t
     i;
 
   ssd=0.0;
@@ -267,7 +267,7 @@ Magick::ChannelPerceptualHash::ChannelPerceptualHash(
     _srgbHuPhash(7),
     _hclpHuPhash(7)
 {
-  ssize_t
+  size_t
     i;
 
   for (i=0; i<7; i++)
@@ -552,7 +552,7 @@ double Magick::ImagePerceptualHash::sumSquaredDifferences(
   double
     ssd;
 
-  ssize_t
+  size_t
     i;
 
   if (!isValid())