diff --git a/MagickCore/version.c b/MagickCore/version.c
index f01e7e0..6adb1cd 100644
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -287,3 +287,36 @@
*version=MagickLibVersion;
return(MagickVersion);
}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% L i s t M a g i c k V e r s i o n %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ListMagickVersion() identifies the ImageMagick version by printing its
+% attributes to the file. Attributes include the copyright, features, and
+% delegates.
+%
+% The format of the ListMagickVersion method is:
+%
+% void ListMagickVersion(FILE *file)
+%
+% A description of each parameter follows:
+%
+% o file: the file, typically stdout.
+%
+*/
+MagickExport void ListMagickVersion(FILE *file)
+{
+ (void) FormatLocaleFile(file,"Version: %s\n",
+ GetMagickVersion((size_t *) NULL));
+ (void) FormatLocaleFile(file,"Copyright: %s\n",GetMagickCopyright());
+ (void) FormatLocaleFile(file,"Features: %s\n",GetMagickFeatures());
+ (void) FormatLocaleFile(file,"Delegates: %s\n\n",GetMagickDelegates());
+}
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 5a7dfb5..b35ec61 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision "10354M"
+#define MagickSVNRevision "10354:10361M"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 8,0,0
@@ -73,6 +73,9 @@
*GetMagickReleaseDate(void),
*GetMagickVersion(size_t *);
+extern MagickExport void
+ ListMagickVersion(FILE *);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/MagickCore/version.h.in b/MagickCore/version.h.in
index 1ad743b..a715d85 100644
--- a/MagickCore/version.h.in
+++ b/MagickCore/version.h.in
@@ -73,6 +73,9 @@
*GetMagickReleaseDate(void),
*GetMagickVersion(size_t *);
+extern MagickExport void
+ ListMagickVersion(FILE *);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/MagickWand/animate.c b/MagickWand/animate.c
index 9899cf1..750fd71 100644
--- a/MagickWand/animate.c
+++ b/MagickWand/animate.c
@@ -188,10 +188,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -315,12 +312,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -1371,12 +1363,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 464d2dc..2c58132 100644
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -148,10 +148,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] image reconstruct difference\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -260,12 +257,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -883,12 +875,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index f9a2647..01560cb 100644
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -337,10 +337,7 @@
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] image [options ...] composite\n"
" [ [options ...] mask ] [options ...] composite\n",
GetClientName());
@@ -457,12 +454,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -1541,12 +1533,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c
index 25b3e48..79b8e0e 100644
--- a/MagickWand/conjure.c
+++ b/MagickWand/conjure.c
@@ -112,10 +112,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -270,12 +267,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
/*
diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index f379c3b..509ac8d 100644
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -445,10 +445,7 @@
const char
**p;
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] file [ [options ...] "
"file ...] [options ...] file\n",GetClientName());
(void) printf("\nImage Settings:\n");
@@ -549,12 +546,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -2952,12 +2944,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("view",option+1) == 0)
diff --git a/MagickWand/display.c b/MagickWand/display.c
index c41b1a9..d4afd10 100644
--- a/MagickWand/display.c
+++ b/MagickWand/display.c
@@ -223,10 +223,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -362,12 +359,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -1797,12 +1789,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("visual",option+1) == 0)
diff --git a/MagickWand/identify.c b/MagickWand/identify.c
index 3c1e31e..ec71972 100644
--- a/MagickWand/identify.c
+++ b/MagickWand/identify.c
@@ -153,10 +153,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] file [ [options ...] "
"file ... ]\n",GetClientName());
(void) printf("\nImage Settings:\n");
@@ -247,12 +244,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
diff --git a/MagickWand/import.c b/MagickWand/import.c
index 1c5c9f8..7f9ddf2 100644
--- a/MagickWand/import.c
+++ b/MagickWand/import.c
@@ -184,10 +184,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] [ file ]\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -310,12 +307,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -1275,12 +1267,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
ThrowImportException(OptionError,"UnrecognizedOption",option);
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 54aca91..639c5db 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -3552,10 +3552,7 @@
const char
**p;
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -3660,14 +3657,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n",
- GetMagickFeatures());
- (void) FormatLocaleFile(stdout,"Delegates: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -6025,12 +6015,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("view",option+1) == 0)
diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index 09e999a..f095b32 100644
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -221,10 +221,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] file [ [options ...] file ...] file\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -338,12 +335,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -1715,12 +1707,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index c02145e..5b40fc1 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -4703,12 +4703,7 @@
*/
if (LocaleCompare("version",option+1) == 0)
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n",GetMagickFeatures());
- (void) FormatLocaleFile(stdout,"Delegates: %s\n\n",
- GetMagickDelegates());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("list",option+1) == 0) {
diff --git a/MagickWand/stream.c b/MagickWand/stream.c
index 2d4fef1..19669ec 100644
--- a/MagickWand/stream.c
+++ b/MagickWand/stream.c
@@ -137,10 +137,7 @@
(char *) NULL
};
- (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
- (void) printf("Copyright: %s\n",GetMagickCopyright());
- (void) printf("Features: %s\n\n",GetMagickFeatures());
- (void) printf("Delegates: %s\n\n",GetMagickDelegates());
+ ListMagickVersion(stdout);
(void) printf("Usage: %s [options ...] input-image raw-image\n",
GetClientName());
(void) printf("\nImage Settings:\n");
@@ -233,12 +230,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
return(MagickFalse);
}
}
@@ -723,12 +715,7 @@
if ((LocaleCompare("version",option+1) == 0) ||
(LocaleCompare("-version",option+1) == 0))
{
- (void) FormatLocaleFile(stdout,"Version: %s\n",
- GetMagickVersion((size_t *) NULL));
- (void) FormatLocaleFile(stdout,"Copyright: %s\n",
- GetMagickCopyright());
- (void) FormatLocaleFile(stdout,"Features: %s\n\n",
- GetMagickFeatures());
+ ListMagickVersion(stdout);
break;
}
if (LocaleCompare("virtual-pixel",option+1) == 0)
diff --git a/configure b/configure
index 82b00f6..3a631d8 100755
--- a/configure
+++ b/configure
@@ -3649,7 +3649,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=10354M
+MAGICK_SVN_REVISION=10354:10361M
