(no commit message)

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index db344b7a7ba96f59b2a99b52e50461d604959c43..285f9df87ca074ae2be80f96863991e267eb071a 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -158,7 +158,7 @@ foreach my $delegate (@tested_delegates) {
 # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
 my $INC_magick = '-I../ -I.. -pthread -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
 my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm';
-my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -I/usr/include/python3.1 -Wall -pthread";
+my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread";
 my $LDFLAGS_magick   = "-L../magick/.libs -lMagickCore $Config{'ldflags'} ";
 my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} ";
 

diff --git a/config/configure.xml b/config/configure.xml
index f26e3f6cdc355664e6e284fcefbd32d946d67e50..2d417543fa82377f22e7a4f76b2d5701a118e8ee 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,13 +9,13 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x668"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,8,6"/>
-  <configure name="RELEASE_DATE" value="2011-03-17"/>
-  <configure name="CONFIGURE" value="./configure  'CFLAGS=-I/usr/include/python3.1'"/>
+  <configure name="RELEASE_DATE" value="2011-03-18"/>
+  <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.8"/>
   <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>
-  <configure name="CFLAGS" value="-fopenmp -I/usr/include/python3.1 -Wall -pthread"/>
+  <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -pthread"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
@@ -23,7 +23,7 @@
   <configure name="LIBS" value="-lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
   <configure name="CXXFLAGS" value="-g -O2 -pthread"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="'CFLAGS=-I/usr/include/python3.1' --disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
   <configure name="FEATURES" value="OpenMP "/>
   <configure name="DELEGATES" value="bzlib fontconfig freetype gvc jpeg jng jp2 lcms2 lzma png tiff x11 xml zlib"/>

diff --git a/libtool b/libtool
index 9b13d52d66237dae9ecec60f553204118b5ffec5..113918329e75513636b785624fb5a6968e84e13a 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -164,7 +164,7 @@ lock_old_archive_extraction=no
 LTCC="gcc -std=gnu99 -std=gnu99"
 
 # LTCC compiler flags.
-LTCFLAGS="-fopenmp -I/usr/include/python3.1 -Wall -pthread"
+LTCFLAGS="-fopenmp -g -O2 -Wall -pthread"
 
 # Take the output of nm and produce a listing of raw symbols and C names.
 global_symbol_pipe="sed -n -e 's/^.*[   ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[       ][      ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"

diff --git a/magick/version.h b/magick/version.h
index 18624167c13a9a83a6dd052161659f212eda1ea1..ae7a52d4b65b383e10e3a814790ca49613e77d48 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-6"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-03-17"
-#define MagickChangeDate   "20110317"
+#define MagickReleaseDate  "2011-03-18"
+#define MagickChangeDate   "20110314"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/utilities/convert.1 b/utilities/convert.1
index 1862f585160187095e562e7c56f4b3a2abd6fb7e..84ca8aea0e552065dd3af3d6ad6d3625d68ef656 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -76,6 +76,8 @@ Image Settings:
   \-scene value         image scene number
   \-seed value          seed a new sequence of pseudo-random numbers
   \-size geometry       width and height of image
+  \-statistic type radius
+                       replace each pixel with corresponding statistic from the neighborhood
   \-stretch type        render text with this font stretch
   \-stroke color        graphic primitive stroke color
   \-strokewidth value   graphic primitive stroke width

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index b6679b733964c817c6a49dc2913e20fc96a23e1b..399797af5ba75ef47ee4feeb9ec8cd0d0339e460 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -206,6 +206,8 @@ Image Operators:
   \-solarize threshold  negate all pixels above the threshold level
   \-splice geometry     splice the background color into the image
   \-spread amount       displace image pixels by a random amount
+  \-statistic type radius
+                       replace each pixel with corresponding statistic from the neighborhood
   \-strip               strip image of all profiles and comments
   \-swirl degrees       swirl image pixels about the center
   \-threshold value     threshold the image