(no commit message)

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 14f4d2b75ffc74856286929fbc24dd811ac6ec4c..27f4f4d593d66929bc4a24a7c2c3978c35d1ac9d 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2217,7 +2217,7 @@ static const char *GetMagickPropertyLetter(const ImageInfo *image_info,
     case 'c':  /* image comment property - empty string by default */
     {
       string=GetImageProperty(image,"comment",exception);
-      if ( string == (const char *)NULL)
+      if (string == (const char *) NULL)
         string="";
       break;
     }
@@ -2245,8 +2245,8 @@ static const char *GetMagickPropertyLetter(const ImageInfo *image_info,
     }
     case 'h': /* Image height (current) */
     {
-      (void) FormatLocaleString(value,MaxTextExtent,"%.20g",
-        (double) (image->rows != 0 ? image->rows : image->magick_rows));
+      (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
+        (image->rows != 0 ? image->rows : image->magick_rows));
       break;
     }
     case 'i': /* Filename last used for image (read or write) */
@@ -2256,7 +2256,9 @@ static const char *GetMagickPropertyLetter(const ImageInfo *image_info,
     }
     case 'k': /* Number of unique colors  */
     {
-      /* FUTURE: ensure this does not generate the formatted comment! */
+      /*
+        FUTURE: ensure this does not generate the formatted comment!
+      */
       (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
         GetNumberColors(image,(FILE *) NULL,exception));
       break;
@@ -2307,7 +2309,7 @@ static const char *GetMagickPropertyLetter(const ImageInfo *image_info,
       (void) FormatLocaleString(value,MaxTextExtent,"%s %s %s",
         CommandOptionToMnemonic(MagickClassOptions,(ssize_t) image->storage_class),
         CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t) colorspace),
-        IfMagickTrue(image->matte)?"Matte":"");
+        IfMagickTrue(image->matte) ? "Matte" : "");
       break;
     }
     case 's': /* Image scene number */
@@ -2475,8 +2477,8 @@ static const char *GetMagickPropertyLetter(const ImageInfo *image_info,
     string=value;
   if (string != (char *) NULL)
     {
-      (void) SetImageArtifact(image, "get-property", string);
-      return(GetImageArtifact(image, "get-property"));
+      (void) SetImageArtifact(image,"get-property",string);
+      return(GetImageArtifact(image,"get-property"));
     }
   return((char *)NULL);
 }

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 48debe6a9bd4e203d478332b4b5cc9987de34c01..4c88a3ede11bcccef371933e050b62a2c613c431 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "8912:8924M"
+#define MagickSVNRevision  "8934:8947M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-08-13"
+#define MagickReleaseDate  "2012-08-14"
 #define MagickChangeDate   "20120808"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index 2ca0189b322d906608ad9e558fc00bfca81171ea..9cee0b5a1b5ee7464ae5cc1d00f53e836c6bc513 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2747,6 +2747,7 @@ SHAREDSTATE_DIR = @SHAREDSTATE_DIR@
 SHARE_PATH = @SHARE_PATH@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SVGDecodeDelegate = @SVGDecodeDelegate@
 SYSCONF_DIR = @SYSCONF_DIR@
 ShowImageDelegate = @ShowImageDelegate@
 TAR = @TAR@

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 9a3f776cd4b9a596c92d5f8e494bf474ed887e7e..0089475a17f204bd8c232847dc099fd4f55063fc 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-08-13</created>
+    <created>2012-08-14</created>
 
     <description xml:lang="en">
 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-08-13</created>
+          <created>2012-08-14</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>

diff --git a/config/configure.xml b/config/configure.xml
index eb95d52d9db312339050461d04c01f59613aea70..671025e4c494a26a893baed087571e8d4ec12583 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="8912:8924M" />
-  <configure name="RELEASE_DATE" value="2012-08-13"/>
+  <configure name="SVN_REVISION" value="8934:8947M" />
+  <configure name="RELEASE_DATE" value="2012-08-14"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index 1527102a287bc057e5773b314bf46c9c52faecb1..49c316d894f9705e683a5ddecdf13a30c6c43892 100644 (file)
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -112,6 +112,7 @@
   <delegate decode="miff" encode="show" spawn="True" command="&quot;@DisplayDelegate@&quot; -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="shtml" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="svg" command="&quot;@RSVGDecodeDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
+  <delegate decode="svg:decode" stealth="True" command="&quot;@SVGDecodeDelegate@&quot; &quot;%i&quot; %s --export-png=&quot;%o&quot; &gt; &quot;-%u&quot;"/>
   <delegate decode="txt" encode="ps" mode="bi" command="&quot;@TXTDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="miff" encode="win" stealth="True" spawn="True" command="&quot;@DisplayDelegate@&quot; -immutable -delay 0 -window-group %[group] -title &quot;%l &quot; &quot;ephemeral:%i&quot;"/>
   <delegate decode="wmf" command="&quot;@WMFDecodeDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>

diff --git a/configure b/configure
index 745369e3053ded2840b1c15f865e3c1862c921d8..57259ceb8960b641309382d5648477a333ae72bf 100755 (executable)
--- a/configure
+++ b/configure
@@ -703,6 +703,7 @@ WWWDecodeDelegate
 WMFDecodeDelegate
 UniconvertorDelegate
 TXTDelegate
+SVGDecodeDelegate
 SCANDecodeDelegate
 RSVGDecodeDelegate
 RMDelegate
@@ -3666,7 +3667,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=8912:8924M
+MAGICK_SVN_REVISION=8934:8947M
 
 
 
@@ -32843,6 +32844,7 @@ RLEEncodeDelegateDefault='rawtorle'
 RMDelegateDefault='rm'
 RSVGDecodeDelegateDefault='rsvg-convert'
 SCANDecodeDelegateDefault='scanimage'
+SVGDecodeDelegateDefault='inkscape'
 TXTDelegateDefault='enscript'
 UniconvertorDelegateDefault='uniconvertor'
 WMFDecodeDelegateDefault='wmf2eps'
@@ -34414,6 +34416,47 @@ $as_echo "no" >&6; }
 fi
 
 
+# Extract the first word of ""$SVGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$SVGDecodeDelegateDefault"; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SVGDecodeDelegate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SVGDecodeDelegate in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SVGDecodeDelegate="$SVGDecodeDelegate" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SVGDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_SVGDecodeDelegate" && ac_cv_path_SVGDecodeDelegate=""$SVGDecodeDelegateDefault""
+  ;;
+esac
+fi
+SVGDecodeDelegate=$ac_cv_path_SVGDecodeDelegate
+if test -n "$SVGDecodeDelegate"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SVGDecodeDelegate" >&5
+$as_echo "$SVGDecodeDelegate" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of ""$TXTDelegateDefault"", so it can be a program name with args.
 set dummy "$TXTDelegateDefault"; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -34826,6 +34869,7 @@ if test "$with_frozenpaths" != 'yes'; then
   RMDelegate="$RMDelegateDefault"
   RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
   SCANDecodeDelegate="$SCANDecodeDelegateDefault"
+  SVGDecodeDelegate="$SVGDecodeDelegateDefault"
   ShowImageDelegate="$ShowImageDelegateDefault"
   TXTDelegate="$TXTDelegateDefault"
   UniconvertorDelegate="$UniconvertorDelegateDefault"

diff --git a/configure.ac b/configure.ac
index 2f2ae8738f3b1d9f5d42561419c96f2a926199be..f47b74612423c2ad1f056927de962b39390944af 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3087,6 +3087,7 @@ RLEEncodeDelegateDefault='rawtorle'
 RMDelegateDefault='rm'
 RSVGDecodeDelegateDefault='rsvg-convert'
 SCANDecodeDelegateDefault='scanimage'
+SVGDecodeDelegateDefault='inkscape'
 TXTDelegateDefault='enscript'
 UniconvertorDelegateDefault='uniconvertor'
 WMFDecodeDelegateDefault='wmf2eps'
@@ -3133,6 +3134,7 @@ AC_PATH_PROG(RLEEncodeDelegate, "$RLEEncodeDelegateDefault", "$RLEEncodeDelegate
 AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault")
 AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
 AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDelegateDefault")
+AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")
 AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
 AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
 AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
@@ -3299,6 +3301,7 @@ if test "$with_frozenpaths" != 'yes'; then
   RMDelegate="$RMDelegateDefault"
   RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
   SCANDecodeDelegate="$SCANDecodeDelegateDefault"
+  SVGDecodeDelegate="$SVGDecodeDelegateDefault"
   ShowImageDelegate="$ShowImageDelegateDefault"
   TXTDelegate="$TXTDelegateDefault"
   UniconvertorDelegate="$UniconvertorDelegateDefault"