...

14 files changed, 82 insertions, 69 deletions

diff --git a/MagickCore/list.h b/MagickCore/list.h
index d949ee597..a88a18813 100644
--- a/MagickCore/list.h
+++ b/MagickCore/list.h
@@ -27,11 +27,11 @@ extern MagickExport Image
   *CloneImages(const Image *,const char *,ExceptionInfo *),
   *DestroyImageList(Image *),
   *DuplicateImages(Image *,const size_t,const char *,ExceptionInfo *),
-  *GetFirstImageInList(const Image *),
-  *GetImageFromList(const Image *,const ssize_t),
-  *GetLastImageInList(const Image *),
-  *GetNextImageInList(const Image *),
-  *GetPreviousImageInList(const Image *),
+  *GetFirstImageInList(const Image *) magick_attribute((__pure__)),
+  *GetImageFromList(const Image *,const ssize_t) magick_attribute((__pure__)),
+  *GetLastImageInList(const Image *) magick_attribute((__pure__)),
+  *GetNextImageInList(const Image *) magick_attribute((__pure__)),
+  *GetPreviousImageInList(const Image *) magick_attribute((__pure__)),
   **ImageListToArray(const Image *,ExceptionInfo *),
   *NewImageList(void),
   *RemoveImageFromList(Image **),
@@ -42,10 +42,10 @@ extern MagickExport Image
   *SyncNextImageInList(const Image *);
 
 extern MagickExport size_t
-  GetImageListLength(const Image *);
+  GetImageListLength(const Image *) magick_attribute((__pure__));
 
 extern MagickExport ssize_t
-  GetImageIndexInList(const Image *);
+  GetImageIndexInList(const Image *) magick_attribute((__pure__));
 
 extern MagickExport void
   AppendImageToList(Image **,const Image *),
diff --git a/MagickCore/locale_.h b/MagickCore/locale_.h
index d2169b613..9a0dcd42f 100644
--- a/MagickCore/locale_.h
+++ b/MagickCore/locale_.h
@@ -52,8 +52,9 @@ extern MagickExport double
   InterpretLocaleValue(const char *magick_restrict,char **magick_restrict);
 
 extern MagickExport int
-  LocaleCompare(const char *,const char *),
-  LocaleNCompare(const char *,const char *,const size_t);
+  LocaleCompare(const char *,const char *) magick_attribute((__pure__)),
+  LocaleNCompare(const char *,const char *,const size_t)
+    magick_attribute((__pure__));
 
 extern MagickExport LinkedListInfo
   *DestroyLocaleOptions(LinkedListInfo *),
diff --git a/MagickCore/string_.h b/MagickCore/string_.h
index 9a13d0851..388a62134 100644
--- a/MagickCore/string_.h
+++ b/MagickCore/string_.h
@@ -70,8 +70,8 @@ extern MagickExport int
 
 extern MagickExport MagickBooleanType
   ConcatenateString(char **,const char *),
-  IsStringTrue(const char *),
-  IsStringFalse(const char *),
+  IsStringTrue(const char *) magick_attribute((__pure__)),
+  IsStringFalse(const char *) magick_attribute((__pure__)),
   SubstituteString(char **,const char *,const char *);
 
 extern MagickExport size_t
diff --git a/MagickCore/token-private.h b/MagickCore/token-private.h
index ca17e1ffd..69b5b3495 100644
--- a/MagickCore/token-private.h
+++ b/MagickCore/token-private.h
@@ -29,7 +29,7 @@ extern "C" {
 #define MaxMultibyteCodes  6
 
 extern MagickPrivate MagickBooleanType
-  IsGlob(const char *);
+  IsGlob(const char *) magick_attribute((__pure__));
 
 typedef struct
 {
diff --git a/MagickCore/token.h b/MagickCore/token.h
index 11ec4b98c..01d62f656 100644
--- a/MagickCore/token.h
+++ b/MagickCore/token.h
@@ -33,7 +33,8 @@ extern MagickExport int
     const char *,const char *,const char *,const char,char *,int *,char *);
 
 extern MagickExport MagickBooleanType
-  GlobExpression(const char *,const char *,const MagickBooleanType);
+  GlobExpression(const char *,const char *,const MagickBooleanType)
+    magick_attribute((__pure__));
 
 extern MagickExport TokenInfo
   *AcquireTokenInfo(void),
diff --git a/MagickCore/utility.h b/MagickCore/utility.h
index 2ca539515..2fddfed98 100644
--- a/MagickCore/utility.h
+++ b/MagickCore/utility.h
@@ -46,7 +46,7 @@ extern MagickExport MagickBooleanType
   IsPathAccessible(const char *);
 
 extern MagickExport size_t
-  MultilineCensus(const char *);
+  MultilineCensus(const char *) magick_attribute((__pure__));
 
 extern MagickExport unsigned char
   *Base64Decode(const char *, size_t *);
diff --git a/MagickWand/drawing-wand.h b/MagickWand/drawing-wand.h
index 263f3951d..20b1ef79b 100644
--- a/MagickWand/drawing-wand.h
+++ b/MagickWand/drawing-wand.h
@@ -40,25 +40,25 @@ extern WandExport char
   *DrawGetVectorGraphics(DrawingWand *);
 
 extern WandExport ClipPathUnits
-  DrawGetClipUnits(const DrawingWand *);
+  DrawGetClipUnits(const DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport DecorationType
-  DrawGetTextDecoration(const DrawingWand *);
+  DrawGetTextDecoration(const DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport DirectionType
   DrawGetTextDirection(const DrawingWand *);
 
 extern WandExport double
-  DrawGetFillOpacity(const DrawingWand *),
-  DrawGetFontSize(const DrawingWand *),
-  DrawGetOpacity(const DrawingWand *),
+  DrawGetFillOpacity(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetFontSize(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetOpacity(const DrawingWand *) magick_attribute((__pure__)),
   *DrawGetStrokeDashArray(const DrawingWand *,size_t *),
-  DrawGetStrokeDashOffset(const DrawingWand *),
-  DrawGetStrokeOpacity(const DrawingWand *),
-  DrawGetStrokeWidth(const DrawingWand *),
-  DrawGetTextKerning(DrawingWand *),
-  DrawGetTextInterlineSpacing(DrawingWand *),
-  DrawGetTextInterwordSpacing(DrawingWand *);
+  DrawGetStrokeDashOffset(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetStrokeOpacity(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetStrokeWidth(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetTextKerning(DrawingWand *) magick_attribute((__pure__)),
+  DrawGetTextInterlineSpacing(DrawingWand *) magick_attribute((__pure__)),
+  DrawGetTextInterwordSpacing(DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport DrawInfo
   *PeekDrawingWand(const DrawingWand *);
@@ -76,25 +76,25 @@ extern WandExport ExceptionType
   DrawGetExceptionType(const DrawingWand *);
 
 extern WandExport FillRule
-  DrawGetClipRule(const DrawingWand *),
-  DrawGetFillRule(const DrawingWand *);
+  DrawGetClipRule(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetFillRule(const DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport GravityType
-  DrawGetGravity(const DrawingWand *);
+  DrawGetGravity(const DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport LineCap
-  DrawGetStrokeLineCap(const DrawingWand *);
+  DrawGetStrokeLineCap(const DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport LineJoin
-  DrawGetStrokeLineJoin(const DrawingWand *);
+  DrawGetStrokeLineJoin(const DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport MagickBooleanType
   DrawClearException(DrawingWand *),
   DrawComposite(DrawingWand *,const CompositeOperator,const double,
     const double,const double,const double,MagickWand *),
   DrawGetFontResolution(const DrawingWand *,double *,double *),
-  DrawGetStrokeAntialias(const DrawingWand *),
-  DrawGetTextAntialias(const DrawingWand *),
+  DrawGetStrokeAntialias(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetTextAntialias(const DrawingWand *) magick_attribute((__pure__)),
   DrawGetTypeMetrics(const DrawingWand *,const char *,MagickBooleanType,
     TypeMetric *),
   DrawPopPattern(DrawingWand *),
@@ -121,8 +121,8 @@ extern WandExport StyleType
   DrawGetFontStyle(const DrawingWand *);
 
 extern WandExport size_t
-  DrawGetFontWeight(const DrawingWand *),
-  DrawGetStrokeMiterLimit(const DrawingWand *);
+  DrawGetFontWeight(const DrawingWand *) magick_attribute((__pure__)),
+  DrawGetStrokeMiterLimit(const DrawingWand *) magick_attribute((__pure__));
 
 extern WandExport void
   ClearDrawingWand(DrawingWand *),
diff --git a/MagickWand/operation.h b/MagickWand/operation.h
index 98c290f89..8895bff07 100644
--- a/MagickWand/operation.h
+++ b/MagickWand/operation.h
@@ -23,7 +23,8 @@ extern "C" {
 #endif
 
 extern WandExport void
-  CLIOption(MagickCLI *,const char *,...);
+  CLIOption(MagickCLI *,const char *,...)
+    magick_attribute((__format__ (__printf__,2,0)));
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
diff --git a/MagickWand/pixel-wand.h b/MagickWand/pixel-wand.h
index 30825ee0b..eeaad42bd 100644
--- a/MagickWand/pixel-wand.h
+++ b/MagickWand/pixel-wand.h
@@ -31,16 +31,16 @@ extern WandExport char
   *PixelGetException(const PixelWand *,ExceptionType *);
 
 extern WandExport double
-  PixelGetAlpha(const PixelWand *),
-  PixelGetBlack(const PixelWand *),
-  PixelGetBlue(const PixelWand *),
-  PixelGetCyan(const PixelWand *),
-  PixelGetFuzz(const PixelWand *),
-  PixelGetGreen(const PixelWand *),
-  PixelGetMagenta(const PixelWand *),
-  PixelGetAlpha(const PixelWand *),
-  PixelGetRed(const PixelWand *),
-  PixelGetYellow(const PixelWand *);
+  PixelGetAlpha(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetBlack(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetBlue(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetCyan(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetFuzz(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetGreen(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetMagenta(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetAlpha(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetRed(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetYellow(const PixelWand *) magick_attribute((__pure__));
 
 extern WandExport ExceptionType
   PixelGetExceptionType(const PixelWand *);
@@ -63,19 +63,19 @@ extern WandExport PixelWand
   **NewPixelWands(const size_t);
 
 extern WandExport Quantum
-  PixelGetAlphaQuantum(const PixelWand *),
-  PixelGetBlackQuantum(const PixelWand *),
-  PixelGetBlueQuantum(const PixelWand *),
-  PixelGetCyanQuantum(const PixelWand *),
-  PixelGetGreenQuantum(const PixelWand *),
-  PixelGetIndex(const PixelWand *),
-  PixelGetMagentaQuantum(const PixelWand *),
-  PixelGetAlphaQuantum(const PixelWand *),
-  PixelGetRedQuantum(const PixelWand *),
-  PixelGetYellowQuantum(const PixelWand *);
+  PixelGetAlphaQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetBlackQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetBlueQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetCyanQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetGreenQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetIndex(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetMagentaQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetAlphaQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetRedQuantum(const PixelWand *) magick_attribute((__pure__)),
+  PixelGetYellowQuantum(const PixelWand *) magick_attribute((__pure__));
 
 extern WandExport size_t
-  PixelGetColorCount(const PixelWand *);
+  PixelGetColorCount(const PixelWand *) magick_attribute((__pure__));
 
 extern WandExport void
   ClearPixelWand(PixelWand *),
diff --git a/MagickWand/wandcli.h b/MagickWand/wandcli.h
index 7a733ef00..e96338c62 100644
--- a/MagickWand/wandcli.h
+++ b/MagickWand/wandcli.h
@@ -32,13 +32,12 @@ extern WandExport MagickCLI
 extern WandExport MagickBooleanType
   CLICatchException(MagickCLI *,const MagickBooleanType),
   CLILogEvent(MagickCLI *,const LogEventType,const char *,const char *,
-    const size_t, const char *,...)
+    const size_t,const char *,...)
     magick_attribute((__format__ (__printf__,6,7))),
   CLIThrowException(MagickCLI *,const char *,const char *,const size_t,
     const ExceptionType,const char *,const char *,...)
     magick_attribute((__format__ (__printf__,7,8)));
 
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
diff --git a/coders/miff.c b/coders/miff.c
index 310b64b3a..6a6e5bf3a 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -180,6 +180,9 @@ static void *AcquireCompressionMemory(void *context,const size_t items,
 
 #if defined(MAGICKCORE_BZLIB_DELEGATE)
 static void *AcquireBZIPMemory(void *context,int items,int size)
+  magick_attribute((__malloc__));
+
+static void *AcquireBZIPMemory(void *context,int items,int size)
 {
   return(AcquireCompressionMemory(context,(size_t) items,(size_t) size));
 }
@@ -187,6 +190,9 @@ static void *AcquireBZIPMemory(void *context,int items,int size)
 
 #if defined(MAGICKCORE_LZMA_DELEGATE)
 static void *AcquireLZMAMemory(void *context,size_t items,size_t size)
+  magick_attribute((__malloc__));
+
+static void *AcquireLZMAMemory(void *context,size_t items,size_t size)
 {
   return(AcquireCompressionMemory(context,items,size));
 }
@@ -194,6 +200,9 @@ static void *AcquireLZMAMemory(void *context,size_t items,size_t size)
 
 #if defined(MAGICKCORE_ZLIB_DELEGATE)
 static voidpf AcquireZIPMemory(voidpf context,unsigned int items,
+  unsigned int size) magick_attribute((__malloc__));
+
+static voidpf AcquireZIPMemory(voidpf context,unsigned int items,
   unsigned int size)
 {
   return((voidpf) AcquireCompressionMemory(context,(size_t) items,
diff --git a/coders/msl.c b/coders/msl.c
index b33f82a37..13ccc06d6 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7625,6 +7625,9 @@ static void MSLComment(void *context,const xmlChar *value)
 }
 
 static void MSLWarning(void *context,const char *format,...)
+  magick_attribute((__format__ (__printf__,2,3)));
+
+static void MSLWarning(void *context,const char *format,...)
 {
   char
     *message,
@@ -7657,6 +7660,9 @@ static void MSLWarning(void *context,const char *format,...)
 }
 
 static void MSLError(void *context,const char *format,...)
+  magick_attribute((__format__ (__printf__,2,3)));
+
+static void MSLError(void *context,const char *format,...)
 {
   char
     reason[MagickPathExtent];
diff --git a/configure b/configure
index 0bf803f8c..e75de26fc 100755
--- a/configure
+++ b/configure
@@ -1993,7 +1993,7 @@ Optional Packages:
   --includearch-dir=DIR   ARCH specific include directory
   --sharearch-dir=DIR     ARCH specific config directory
   --with-pkgconfigdir=DIR Path to the pkgconfig directory [LIBDIR/pkgconfig]
-  --without-threads       disable threads support
+  --without-threads       disable POSIX threads API support
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-aix-soname=aix|svr4|both
@@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=15
 
 MAGICK_VERSION=7.0.8-15
 
-MAGICK_GIT_REVISION=14963:5c91a54d9:20181031
+MAGICK_GIT_REVISION=14965:3a037126f:20181110
 
 
 # Substitute library versioning
@@ -9784,9 +9784,7 @@ fi
 
 
 #
-# Enable support for threads
-#
-# Find Posix threads library
+# Enable support for POSIX thread APIs
 #
 
 # Check whether --with-threads was given.
@@ -10446,7 +10444,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
         DEF_THREAD="$PTHREAD_CFLAGS"
         CFLAGS="$CFLAGS $DEF_THREAD"
         CXXFLAGS="$CXXFLAGS $DEF_THREAD"
-	THREAD_LIBS="$PTHREAD_LIBS"
+        THREAD_LIBS="$PTHREAD_LIBS"
         if test "$CC" != "$PTHREAD_CC"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads." >&5
 $as_echo "$as_me: WARNING: Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads." >&2;}
diff --git a/configure.ac b/configure.ac
index 5eb9bd8ea..40df39324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,12 +469,10 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=DIR],
 AC_SUBST([pkgconfigdir])
 
 #
-# Enable support for threads
-#
-# Find Posix threads library
+# Enable support for POSIX thread APIs
 #
 AC_ARG_WITH([threads],
-    [AC_HELP_STRING([--without-threads], [disable threads support])],
+    [AC_HELP_STRING([--without-threads], [disable POSIX threads API support])],
     [with_threads=$withval],
     [with_threads='yes'])
 
@@ -487,7 +485,7 @@ if test "$with_threads" != 'no'; then
         DEF_THREAD="$PTHREAD_CFLAGS"
         CFLAGS="$CFLAGS $DEF_THREAD"
         CXXFLAGS="$CXXFLAGS $DEF_THREAD"
-	THREAD_LIBS="$PTHREAD_LIBS"
+        THREAD_LIBS="$PTHREAD_LIBS"
         if test "$CC" != "$PTHREAD_CC"; then
             AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
             CC="$PTHREAD_CC"