(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index d3a89e656ba4bbc67e939bebe9718cc72724150a..78be29a36573ad718260e8fa7875716458d19418 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.5
-%define Patchlevel  8
+%define Patchlevel  9
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/jpeg.c b/coders/jpeg.c
index c4f79f2068f677219de2268b2cc4f010c33b7db4..34bb36da37dbca8a95fab1d18d8eacddc9491202 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1239,7 +1239,7 @@ ModuleExport unsigned long RegisterJPEGImage(void)
     *entry;
 
   static const char
-    *description = "Joint Photographic Experts Group JFIF format";
+    description[] = "Joint Photographic Experts Group JFIF format";
 
   *version='\0';
 #if defined(JPEG_LIB_VERSION)

diff --git a/config/configure.xml b/config/configure.xml
index dc3c99ef82efd79a7118c04eb5bb21bb659e26ae..da0939e4f81547d22552f5b330a68f285c6b53b7 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,8 +8,8 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x655"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,5,8"/>
-  <configure name="RELEASE_DATE" value="2009-09-07"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,5,9"/>
+  <configure name="RELEASE_DATE" value="2009-09-08"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index c3c09755e3b838431269b24d1763fb8e53547813..4d9e86bf86a0a8c99b89028afb81701d020683e8 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.5.5-8
+# Generated automatically by config.status (ImageMagick) 6.5.5-9
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/magick/image-private.h b/magick/image-private.h
index 0c0a8e00846769ba671debcc1d0d791ff177affb..1ac0a95d3ec09b6bea3d1bf74c170a12098ac95f 100644 (file)
--- a/magick/image-private.h
+++ b/magick/image-private.h
@@ -32,19 +32,19 @@ extern "C" {
 #define UndefinedCompressionQuality  0UL
 
 extern MagickExport const char
-  *BackgroundColor,
-  *BorderColor,
-  *DefaultTileFrame,
-  *DefaultTileGeometry,
-  *DefaultTileLabel,
-  *ForegroundColor,
-  *MatteColor,
-  *LoadImageTag,
-  *LoadImagesTag,
-  *PSDensityGeometry,
-  *PSPageGeometry,
-  *SaveImageTag,
-  *SaveImagesTag;
+  BackgroundColor[],
+  BorderColor[],
+  DefaultTileFrame[],
+  DefaultTileGeometry[],
+  DefaultTileLabel[],
+  ForegroundColor[],
+  MatteColor[],
+  LoadImageTag[],
+  LoadImagesTag[],
+  PSDensityGeometry[],
+  PSPageGeometry[],
+  SaveImageTag[],
+  SaveImagesTag[];
 
 extern MagickExport const double
   DefaultResolution;

diff --git a/magick/image.c b/magick/image.c
index 9fa0eda73eedf3bcd1e71577161edb1cab28da64..35e1a9cf17aa433d1c35a063c6d87d54b1e80953 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -96,20 +96,20 @@
   Constant declaration.
 */
 const char
-  *BackgroundColor = "#ffffff",  /* white */
-  *BorderColor = "#dfdfdf",  /* gray */
-  *DefaultTileFrame = "15x15+3+3",
-  *DefaultTileGeometry = "120x120+4+3>",
-  *DefaultTileLabel = "%f\n%G\n%b",
-  *ForegroundColor = "#000",  /* black */
-  *LoadImageTag = "Load/Image",
-  *LoadImagesTag = "Load/Images",
-  *MatteColor = "#bdbdbd",  /* gray */
-  *PSDensityGeometry = "72.0x72.0",
-  *PSPageGeometry = "612x792",
-  *SaveImageTag = "Save/Image",
-  *SaveImagesTag = "Save/Images",
-  *TransparentColor = "#00000000";  /* transparent black */
+  BackgroundColor[] = "#ffffff",  /* white */
+  BorderColor[] = "#dfdfdf",  /* gray */
+  DefaultTileFrame[] = "15x15+3+3",
+  DefaultTileGeometry[] = "120x120+4+3>",
+  DefaultTileLabel[] = "%f\n%G\n%b",
+  ForegroundColor[] = "#000",  /* black */
+  LoadImageTag[] = "Load/Image",
+  LoadImagesTag[] = "Load/Images",
+  MatteColor[] = "#bdbdbd",  /* gray */
+  PSDensityGeometry[] = "72.0x72.0",
+  PSPageGeometry[] = "612x792",
+  SaveImageTag[] = "Save/Image",
+  SaveImagesTag[] = "Save/Images",
+  TransparentColor[] = "#00000000";  /* transparent black */
 
 const double
   DefaultResolution = 72.0;

diff --git a/magick/version.h b/magick/version.h
index 72e55e145f80df384de288992775daeabfeca548..097d32011f71490b742a67ab8caecbbad4d85f8f 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,8 +30,8 @@ extern "C" {
 #define MagickLibVersion  0x655
 #define MagickLibVersionText  "6.5.5"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-8"
-#define MagickReleaseDate  "2009-09-07"
+#define MagickLibSubversion  "-9"
+#define MagickReleaseDate  "2009-09-08"
 #define MagickChangeDate   "20090907"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.5/index.html"

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 4ed49219120117b6ae0756d149575605554fe911..a6d0beb248bc334e47ae086db7f6efea535ca09e 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -57,9 +57,9 @@
   Constant declaration.
 */
 static const char
-  *BackgroundColor = "#fff",  /* white */
-  *BorderColor = "#dfdfdf",  /* gray */
-  *MatteColor = "#bdbdbd";  /* gray */
+  BackgroundColor[] = "#fff",  /* white */
+  BorderColor[] = "#dfdfdf",  /* gray */
+  MatteColor[] = "#bdbdbd";  /* gray */
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%