(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index f62d81dfc77833de06d175e177378ee67e25e213..70b525c8b1ef30ea7ed7777030f06be552a84816 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -96,7 +96,7 @@ Note this documentation can also be found on the ImageMagick website:
 http://www.imagemagick.org/.
 
 
-%package -n perl-%{name}
+%package perl
 Summary: ImageMagick perl bindings
 Group: System Environment/Libraries
 Requires: perl-base

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index e20fdc49215a5bca3f96219564a24da63eebbeaa..68279d3a3485fb92f6c1c7fe4e8fb9bd16750695 100644 (file)
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -96,7 +96,7 @@ Note this documentation can also be found on the ImageMagick website:
 http://www.imagemagick.org/.
 
 
-%package -n perl-%{name}
+%package perl
 Summary: ImageMagick perl bindings
 Group: System Environment/Libraries
 Requires: perl-base
@@ -104,7 +104,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 
-%description -n perl-%{name}
+%description perl
 Perl bindings to ImageMagick.
 
 Install ImageMagick-perl if you want to use any perl scripts that use

diff --git a/config/configure.xml b/config/configure.xml
index c775626e65a902f39cc2e9294b76cb4c45313a40..f277029e030f2732b7e217804e3d64721433cd9e 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x668"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,8,0"/>
-  <configure name="RELEASE_DATE" value="2011-02-26"/>
+  <configure name="RELEASE_DATE" value="2011-03-04"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/config/delegates.xml b/config/delegates.xml
index e72a3150a64aee5ce82f75a507811898570f7f92..a7d6f3fa5d067b5042b6621b5a60c7b5926a2885 100644 (file)
--- a/config/delegates.xml
+++ b/config/delegates.xml
@@ -47,6 +47,7 @@
     %g  image geometry
     %h  image rows (height)
     %k  input image number colors
+    %l  image label
     %m  input image format
     %p  page number
     %q  input image depth

diff --git a/magick/version.h b/magick/version.h
index ed57c43f6cb1f641555d5d7d8316c6ca22dfe2fd..e1fb801011ef7a343ea4fd2410e2c62b267a3995 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-02-26"
-#define MagickChangeDate   "20110222"
+#define MagickReleaseDate  "2011-03-04"
+#define MagickChangeDate   "20110227"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 9e5f7a8dced7dc6a08a27d5e04e9e6e631432380..52a5c82fcc5bc28a8d47c0e472c4c2a50793e3ee 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -2759,7 +2759,10 @@ MagickExport void XFreeResources(Display *display,XVisualInfo *visual_info,
     Free font.
   */
   if (font_info != (XFontStruct *) NULL)
-    (void) XFreeFont(display,font_info);
+    {
+      (void) XFreeFont(display,font_info);
+      font_info=(XFontStruct *) NULL;
+    }
   if (map_info != (XStandardColormap *) NULL)
     {
       /*

diff --git a/utilities/convert.1 b/utilities/convert.1
index 4b18e20ab950cf366d1035414773481711f26574..1862f585160187095e562e7c56f4b3a2abd6fb7e 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -155,6 +155,7 @@ Image Operators:
   \-linear-stretch geometry
                        improve contrast by `stretching with saturation' the intensity range
   \-median radius       apply a median filter to the image
+  \-mode radius         make each pixel the 'predominate color' of the neighborhood
   \-modulate value      vary the brightness, saturation, and hue
   \-monochrome          transform image to black and white
   \-morphology method kernel

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index b5f390c345e7f07c7d541db82ab4dc4523b65ca6..b6679b733964c817c6a49dc2913e20fc96a23e1b 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -159,6 +159,7 @@ Image Operators:
   \-linear-stretch geometry
                        improve contrast by `stretching with saturation' the intensity range
   \-median radius       apply a median filter to the image
+  \-mode radius         make each pixel the 'predominate color' of the neighborhood
   \-modulate value      vary the brightness, saturation, and hue
   \-monochrome          transform image to black and white
   \-motion-blur geometry