]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <mikayla-grace@urban-warrior.org>
Mon, 13 May 2019 19:45:13 +0000 (15:45 -0400)
committerCristy <mikayla-grace@urban-warrior.org>
Mon, 13 May 2019 19:45:13 +0000 (15:45 -0400)
Magick++/tests/averageImages.cpp
Makefile.in
config/Makefile.am
config/config.h.in
configure

index 65a7339ddbb66e7a279c19c8a4ca9889d61732bb..66bc1aad7bcbefb28b159976cda43bb8c9b9f5cc 100644 (file)
@@ -40,7 +40,7 @@ int main( int /*argc*/, char ** argv)
     averageImages( &averaged, imageList.begin(), imageList.end() );
     // averaged.display();
     if (( averaged.signature() != "8e6e1a9b5f1eec5539b1f44347249f227f3e07f9acb07d80404ca6a19f88db7c") &&
-        ( averaged.signature() != "ad4861b99339d84bed685eb42bbabe657abb60d48b8fc7ddf680af866dd45ad4"))
+        ( averaged.signature() != "90c4ba4b092f37a0600d51356f9aba89e7402ba3f59ac591ae216bace4a9d10b"))
       {
        cout << "Line: " << __LINE__
             << "  Averaging image failed, signature = "
index bd22419a944fc08475a4b5c745d607a5d23ba69b..b2266b0e57e76c3f0f1418cf7493c94558a846a7 100644 (file)
@@ -3511,6 +3511,7 @@ CONFIG_EXTRA_DIST = \
        config/francais.xml \
        config/ImageMagick.rc \
        config/ImageMagick.rdf.in \
+       config/install-sh \
        config/lndir.sh \
        config/locale.md \
        config/locale.xml \
index 8e66ec7187553da77701529bc79a43c5089c2a16..079c121877a608711adfaacb30bdf840882386e9 100644 (file)
@@ -55,6 +55,7 @@ CONFIG_EXTRA_DIST = \
        config/francais.xml \
        config/ImageMagick.rc \
        config/ImageMagick.rdf.in \
+       config/install-sh \
        config/lndir.sh \
        config/locale.md \
        config/locale.xml \
index a6c03ca006ae37fe51d79a0febadc9b4f39d1ca8..76706e9ddf68f0cbf63375da71041073f8f05f35 100644 (file)
 /* Define to 1 if you have the `clock_getres' function. */
 #undef HAVE_CLOCK_GETRES
 
-/* Define to 1 if you have clock_gettime. */
+/* Define to 1 if you have the `clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME
 
 /* Define to 1 if clock_gettime supports CLOCK_REALTIME. */
index 267b5d1aecb230f2799477a0699ea0f096f78bae..d6165ba02f5b3cc96a7a9660f93846b43467852e 100755 (executable)
--- a/configure
+++ b/configure
@@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=46
 
 MAGICK_VERSION=7.0.8-46
 
-MAGICK_GIT_REVISION=15636:ea417882b:20190513
+MAGICK_GIT_REVISION=15634:f086cda3b:20190513
 
 
 # Substitute library versioning