diff --git a/MagickCore/property.c b/MagickCore/property.c
index 14f4d2b..27f4f4d 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2217,7 +2217,7 @@
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 @@
}
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 @@
}
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 @@
(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 @@
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 48debe6..4c88a3e 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@
*/
#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 2ca0189..9cee0b5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2747,6 +2747,7 @@
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 9a3f776..0089475 100644
--- 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 @@
<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 eb95d52..671025e 100644
--- 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 1527102..49c316d 100644
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -112,6 +112,7 @@
<delegate decode="miff" encode="show" spawn="True" command=""@DisplayDelegate@" -delay 0 -window-group %[group] -title "%l " "ephemeral:%i""/>
<delegate decode="shtml" command=""@HTMLDecodeDelegate@" -U -o "%o" "%i""/>
<delegate decode="svg" command=""@RSVGDecodeDelegate@" -o "%o" "%i""/>
+ <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%i" %s --export-png="%o" > "-%u""/>
<delegate decode="txt" encode="ps" mode="bi" command=""@TXTDelegate@" -o "%o" "%i""/>
<delegate decode="miff" encode="win" stealth="True" spawn="True" command=""@DisplayDelegate@" -immutable -delay 0 -window-group %[group] -title "%l " "ephemeral:%i""/>
<delegate decode="wmf" command=""@WMFDecodeDelegate@" -o "%o" "%i""/>
diff --git a/configure b/configure
index 745369e..57259ce 100755
--- a/configure
+++ b/configure
@@ -703,6 +703,7 @@
WMFDecodeDelegate
UniconvertorDelegate
TXTDelegate
+SVGDecodeDelegate
SCANDecodeDelegate
RSVGDecodeDelegate
RMDelegate
@@ -3666,7 +3667,7 @@
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 @@
RMDelegateDefault='rm'
RSVGDecodeDelegateDefault='rsvg-convert'
SCANDecodeDelegateDefault='scanimage'
+SVGDecodeDelegateDefault='inkscape'
TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
WMFDecodeDelegateDefault='wmf2eps'
@@ -34414,6 +34416,47 @@
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 @@
RMDelegate="$RMDelegateDefault"
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SCANDecodeDelegate="$SCANDecodeDelegateDefault"
+ SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
diff --git a/configure.ac b/configure.ac
index 2f2ae87..f47b746 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3087,6 +3087,7 @@
RMDelegateDefault='rm'
RSVGDecodeDelegateDefault='rsvg-convert'
SCANDecodeDelegateDefault='scanimage'
+SVGDecodeDelegateDefault='inkscape'
TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
WMFDecodeDelegateDefault='wmf2eps'
@@ -3133,6 +3134,7 @@
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 @@
RMDelegate="$RMDelegateDefault"
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
SCANDecodeDelegate="$SCANDecodeDelegateDefault"
+ SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
TXTDelegate="$TXTDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"