From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 23 Sep 2016 16:23:53 +0000 (-0400)
Subject: Update to latest automake / autoconfig
X-Git-Tag: 7.0.3-2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=223ee631fe36daa81e6ea877372cae9c2445703e;p=imagemagick

Update to latest automake / autoconfig
---

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 9f8ed5aff..e6cbeb6c6 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -1416,9 +1416,12 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   if (strlen(format) > 1)
     format[strlen(format)-1]='\0';
   (void) FormatLocaleFile(file,"  Number pixels: %s\n",format);
-  (void) FormatMagickSize((MagickSizeType) ((double) image->columns*image->rows/
-    elapsed_time+0.5),MagickFalse,"B",MagickPathExtent,format);
-  (void) FormatLocaleFile(file,"  Pixels per second: %s\n",format);
+  if (elapsed_time > MagickEpsilon)
+    {
+      (void) FormatMagickSize((MagickSizeType) ((double) image->columns*
+        image->rows/elapsed_time+0.5),MagickFalse,"B",MagickPathExtent,format);
+      (void) FormatLocaleFile(file,"  Pixels per second: %s\n",format);
+    }
   (void) FormatLocaleFile(file,"  User time: %0.3fu\n",user_time);
   (void) FormatLocaleFile(file,"  Elapsed time: %lu:%02lu.%03lu\n",
     (unsigned long) (elapsed_time/60.0),(unsigned long) ceil(fmod(elapsed_time,
diff --git a/aclocal.m4 b/aclocal.m4
index fd0bbfe7c..3574d7c0a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -790,7 +790,7 @@ AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[
 ])dnl AX_COMPILER_FLAGS
 
 # longlong.m4 serial 17
-dnl Copyright (C) 1999-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/configure b/configure
index 58d2a4dd6..63ad8f538 100755
--- a/configure
+++ b/configure
@@ -4517,7 +4517,7 @@ MAGICK_PATCHLEVEL_VERSION=2
 
 MAGICK_VERSION=7.0.3-2
 
-MAGICK_GIT_REVISION=18852:3448b33:20160920
+MAGICK_GIT_REVISION=18853:ca0dd94:20160923
 
 
 # Substitute library versioning