(no commit message)

diff --git a/MagickCore/property.c b/MagickCore/property.c
index fe0dfc82433da444d4fc8b2e24d721e2605031b5..337b7769a24b1df02d35b2efdda7da7fed2ab19a 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2717,20 +2717,24 @@ MagickExport const char *GetMagickProperty(ImageInfo *image_info,
         }
      break;
     }
-/*  OBSOLETE  The 'page' of a image, is just the images index
-    This conficts with the -set page option that sets virtual canvas info
     case 'p':
     {
-      if (LocaleCompare("page",property) == 0)
+      if (LocaleCompare("profile",property) == 0)
         {
-          WarnNoImageReturn("\"%%[%s]\"",property);
-          (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
-            GetImageIndexInList(image)+1);
+          const char
+            *name;
+
+          ResetImageProfileIterator(image);
+          name=GetNextImageProfile(image);
+          while (name != (char *) NULL)
+          {
+            (void) FormatLocaleString(value,MaxTextExtent,"%s %s",value,name);
+            name=GetNextImageProfile(image);
+          }
           break;
         }
       break;
     }
-*/
     case 'r':
     {
       if (LocaleCompare("resolution.x",property) == 0)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 0a9856bbb92d66339bce99d4c088f6773364139e..764977cf75076d1827d4aa670b2685fdbdf6aa8d 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "13473:13476"
+#define MagickSVNRevision  "13486M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -39,7 +39,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2013-10-17"
+#define MagickReleaseDate  "2013-10-18"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/configure b/configure
index 81e5af54850897c0140cfc14617059f0f5649eb1..531f62510765d9cbade46c45c2fc4f8ad072f8da 100755 (executable)
--- a/configure
+++ b/configure
@@ -3691,7 +3691,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=13473:13476
+MAGICK_SVN_REVISION=13486M
 
 
 # Substitute library versioning