From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 17 Feb 2015 18:13:52 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1275
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2bb8c55e96c209e1f43ace100cfb2f73f7ab4cc;p=imagemagick

---

diff --git a/MagickCore/version.c b/MagickCore/version.c
index fb9b78afc..56d7df5c3 100644
--- a/MagickCore/version.c
+++ b/MagickCore/version.c
@@ -288,6 +288,29 @@ MagickExport char *GetMagickHomeURL(void)
 %                                                                             %
 %                                                                             %
 %                                                                             %
+%   G e t M a g i c k L i c e n s e                                           %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  GetMagickLicense() returns the ImageMagick API license as a string.
+%
+%  The format of the GetMagickLicense method is:
+%
+%      const char *GetMagickLicense(void)
+%
+*/
+MagickExport const char *GetMagickLicense(void)
+{
+  return(MagickAuthoritativeLicense);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   G e t M a g i c k P a c k a g e N a m e                                   %
 %                                                                             %
 %                                                                             %
@@ -551,6 +574,7 @@ 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,"License: %s\n",GetMagickLicense());
   (void) FormatLocaleFile(file,"Features: %s\n",GetMagickFeatures());
   (void) FormatLocaleFile(file,"Delegates (built-in): %s\n\n",
     GetMagickDelegates());
diff --git a/MagickCore/version.h b/MagickCore/version.h
index ee77356ba..6643ec5ed 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -48,8 +48,10 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2015-02-07"
+#define MagickReleaseDate  "2015-02-17"
 #define MagickChangeDate   "20120427"
+#define MagickAuthoritativeLicense  \
+  "http://www.imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"
 #define MagickDelegates "bzlib djvu mpeg fftw fpx fontconfig freetype jbig jng jpeg lcms lzma openexr pango png ps tiff webp x xml zlib"
@@ -82,6 +84,7 @@ extern MagickExport const char
   *GetMagickCopyright(void),
   *GetMagickDelegates(void),
   *GetMagickFeatures(void),
+  *GetMagickLicense(void),
   *GetMagickPackageName(void),
   *GetMagickQuantumDepth(size_t *),
   *GetMagickQuantumRange(size_t *),
diff --git a/MagickCore/version.h.in b/MagickCore/version.h.in
index 87dd99f37..4a0e7fb35 100644
--- a/MagickCore/version.h.in
+++ b/MagickCore/version.h.in
@@ -50,6 +50,8 @@ extern "C" {
 #define MagickppLibMinInterface  @MAGICKPP_LIBRARY_CURRENT_MIN@
 #define MagickReleaseDate  "@PACKAGE_RELEASE_DATE@"
 #define MagickChangeDate   "@PACKAGE_CHANGE_DATE@"
+#define MagickAuthoritativeLicense  \
+  "http://www.imagemagick.org/script/license.php"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "@MAGICK_FEATURES@"
 #define MagickDelegates "@MAGICK_DELEGATES@"
@@ -82,6 +84,7 @@ extern MagickExport const char
   *GetMagickCopyright(void),
   *GetMagickDelegates(void),
   *GetMagickFeatures(void),
+  *GetMagickLicense(void),
   *GetMagickPackageName(void),
   *GetMagickQuantumDepth(size_t *),
   *GetMagickQuantumRange(size_t *),