...

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 09b532becc888ecf1b3078d4e22a9257445da24f..a8eed5f979f6e73f3dda4ed9c17c89c8ee144485 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1677,29 +1677,45 @@ static MagickBooleanType GetICCProperty(const Image *image,const char *property,
         char
           info[MagickPathExtent];
 
-        int
-          status;
+        unsigned int
+          extent;
 
         (void) memset(info,0,sizeof(info));
-        status=cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,"en","US",
-          info,MagickPathExtent);
-        if (status != 0)
-          (void) SetImageProperty((Image *) image,"icc:description",info,
-            exception);
-        status=cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,"en","US",
-          info,MagickPathExtent);
-        if (status != 0)
-          (void) SetImageProperty((Image *) image,"icc:manufacturer",info,
-            exception);
-        status=cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en","US",
-          info,MagickPathExtent);
-        if (status != 0)
-          (void) SetImageProperty((Image *) image,"icc:model",info,exception);
-        status=cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,"en","US",
-          info,MagickPathExtent);
-        if (status != 0)
-          (void) SetImageProperty((Image *) image,"icc:copyright",info,
-            exception);
+        extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,"en","US",
+          NULL,0);
+        if (extent != 0)
+          {
+            extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoDescription,"en",
+              "US",info,MagickMin(MagickPathExtent-1,extent));
+            (void) SetImageProperty((Image *) image,"icc:description",info,
+              exception);
+         }
+        extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,"en","US",
+          NULL,0);
+        if (extent != 0)
+          {
+            extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoManufacturer,"en",
+              "US",info,MagickMin(MagickPathExtent-1,extent));
+            (void) SetImageProperty((Image *) image,"icc:manufacturer",info,
+              exception);
+          }
+        extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en","US",
+          NULL,0);
+        if (extent != 0)
+          {
+            extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoModel,"en","US",
+              info,MagickMin(MagickPathExtent-1,extent));
+            (void) SetImageProperty((Image *) image,"icc:model",info,exception);
+          }
+        extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,"en","US",
+          NULL,0);
+        if (extent != 0)
+          {
+            extent=cmsGetProfileInfoASCII(icc_profile,cmsInfoCopyright,"en",
+              "US",info,MagickMin(MagickPathExtent-1,extent));
+            (void) SetImageProperty((Image *) image,"icc:copyright",info,
+              exception);
+          }
 #endif
         (void) cmsCloseProfile(icc_profile);
       }

diff --git a/configure b/configure
index 6ddb2a4e98e42877f9a49013687475dfd003ce2a..3a627c443905d1d3c4cd2e6e75052813babd60eb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-3.
+# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-4.
 #
 # Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='7.0.8-3'
-PACKAGE_STRING='ImageMagick 7.0.8-3'
+PACKAGE_VERSION='7.0.8-4'
+PACKAGE_STRING='ImageMagick 7.0.8-4'
 PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues'
 PACKAGE_URL='https://www.imagemagick.org'
 
@@ -1842,7 +1842,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ImageMagick 7.0.8-3 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.8-4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1917,7 +1917,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 7.0.8-3:";;
+     short | recursive ) echo "Configuration of ImageMagick 7.0.8-4:";;
    esac
   cat <<\_ACEOF
 
@@ -2204,7 +2204,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 7.0.8-3
+ImageMagick configure 7.0.8-4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3255,7 +3255,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ImageMagick $as_me 7.0.8-3, which was
+It was created by ImageMagick $as_me 7.0.8-4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4241,7 +4241,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ImageMagick'
- VERSION='7.0.8-3'
+ VERSION='7.0.8-4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4551,11 +4551,11 @@ MAGICK_MINOR_VERSION=0
 
 MAGICK_MICRO_VERSION=8
 
-MAGICK_PATCHLEVEL_VERSION=3
+MAGICK_PATCHLEVEL_VERSION=4
 
-MAGICK_VERSION=7.0.8-3
+MAGICK_VERSION=7.0.8-4
 
-MAGICK_GIT_REVISION=14485:5ff0db981:20180620
+MAGICK_GIT_REVISION=14491:5e87ab2c3:20180625
 
 
 # Substitute library versioning
@@ -37719,7 +37719,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ImageMagick $as_me 7.0.8-3, which was
+This file was extended by ImageMagick $as_me 7.0.8-4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -37786,7 +37786,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ImageMagick config.status 7.0.8-3
+ImageMagick config.status 7.0.8-4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 5e6a029ba6f05be3e6a5fcea6196882ac4a3c8f0..c10458e580b946c70b6f88d7c15423b1e7362b35 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_PREREQ(2.69)
 m4_define([magick_major_version], [7])
 m4_define([magick_minor_version], [0])
 m4_define([magick_micro_version], [8])
-m4_define([magick_patchlevel_version], [3])
+m4_define([magick_patchlevel_version], [4])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
 m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | awk '{ print \$1 }' | tr -d '\n'"]))

diff --git a/version.sh b/version.sh
index f61b1e907a73f49cf6fc4fa3c0886a6c818276ab..dfe420475eef46916ed75ddae2b67bd6bbd5bb23 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -19,7 +19,7 @@ PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print
 PACKAGE_VERSION='7.0.8'
 PACKAGE_PERL_VERSION='7.0.8'
 PACKAGE_LIB_VERSION="0x708"
-PACKAGE_RELEASE="3"
+PACKAGE_RELEASE="4"
 PACKAGE_LIB_VERSION_NUMBER="7,0,8,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE_RAW=`date +%F`
 PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"