(no commit message)

diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index cfb3b9800fd026fe843f5745c71c9c1bdf28120a..facacacfd2a6a6b1b09967fae369ccc1c4a9304d 100644 (file)
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -952,14 +952,16 @@ namespace Magick
   class MagickDLLDecl shadeImage : public std::unary_function<Image&,void>
   {
   public:
-    shadeImage( const double clusterThreshold_ = 1.0, 
-    const double smoothingThreshold_ = 1.5 );
+    shadeImage( const double azimuth_ = 30,
+    const double elevation_ = 30,
+    const bool   colorShading_ = false );
 
     void operator()( Image &image_ ) const;
 
   private:
-    double  _clusterThreshold;
-    double  _smoothingThreshold;
+    double  _azimuth;
+    double  _elevation;
+    bool    _colorShading;
   };
 
   // Sharpen pixels in image

diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index 78c73c5bcc99d68d46139e6c42c08b72a756f266..cbc96f28876adcc22463d97618a9f8dc77975d20 100644 (file)
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -875,10 +875,12 @@ void Magick::segmentImage::operator()( Magick::Image &image_ ) const
 }
 
 // Shade image using distant light source
-Magick::shadeImage::shadeImage( const double clusterThreshold_, 
-                                const double smoothingThreshold_ )
-  : _clusterThreshold( clusterThreshold_ ),
-    _smoothingThreshold( smoothingThreshold_ )
+Magick::shadeImage::shadeImage( const double azimuth_,
+                                const double elevation_,
+        const bool colorShading_)
+  : _azimuth( azimuth_ ),
+    _elevation( elevation_ ),
+    _colorShading (colorShading_)
 {
 }
 void Magick::shadeImage::operator()( Magick::Image &image_ ) const

diff --git a/config/configure.xml b/config/configure.xml
index 6a276a32920c4421b82de8d454ef382950c64e56..0fcbbb9a49e9fec04885e49c963392bf88f739dc 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x657"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,7,0"/>
-  <configure name="RELEASE_DATE" value="2009-10-14"/>
+  <configure name="RELEASE_DATE" value="2009-10-15"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 3a71e8c86c85f74816003f57d022294d7105c1a5..2a9b04bdbd79dc13e9bc2d0f585867da7e715045 100755 (executable)
--- a/configure
+++ b/configure
@@ -1245,7 +1245,6 @@ enable_installed
 enable_cipher
 enable_embeddable
 enable_hdri
-enable_libtool_verbose
 enable_assert
 enable_maintainer_mode
 enable_ccmalloc
@@ -1977,8 +1976,6 @@ Optional Features:
                           zero-configuration ImageMagick
   --enable-hdri           accurately represent the wide range of intensity
                           levels found in real scenes
-  --enable-libtool-verbose
-                          enable verbose libtool output
   --disable-assert        disable assert() statements in build
   --enable-maintainer-mode  enable make rules and dependencies not useful
                          (and sometimes confusing) to the casual installer
@@ -9184,13 +9181,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:9187: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:9184: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:9190: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:9187: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:9193: output\"" >&5)
+  (eval echo "\"\$as_me:9190: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -10381,7 +10378,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 10384 "configure"' > conftest.$ac_ext
+  echo '#line 10381 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -12784,11 +12781,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12787: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12784: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12791: \$? = $ac_status" >&5
+   echo "$as_me:12788: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13123,11 +13120,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13126: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13123: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13130: \$? = $ac_status" >&5
+   echo "$as_me:13127: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13228,11 +13225,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13231: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13228: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13235: \$? = $ac_status" >&5
+   echo "$as_me:13232: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13283,11 +13280,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13286: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13283: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13290: \$? = $ac_status" >&5
+   echo "$as_me:13287: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16086,7 +16083,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 16089 "configure"
+#line 16086 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16182,7 +16179,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 16185 "configure"
+#line 16182 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18202,11 +18199,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18205: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18202: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18209: \$? = $ac_status" >&5
+   echo "$as_me:18206: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -18301,11 +18298,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18304: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18301: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18308: \$? = $ac_status" >&5
+   echo "$as_me:18305: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18353,11 +18350,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18356: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18353: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18360: \$? = $ac_status" >&5
+   echo "$as_me:18357: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20276,7 +20273,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 20279 "configure"
+#line 20276 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21682,19 +21679,6 @@ _ACEOF
 
 fi
 
-# Enable verbose output from libtool (enable libtool's default)
-# Check whether --enable-libtool-verbose was given.
-if test "${enable_libtool_verbose+set}" = set; then
-  enableval=$enable_libtool_verbose; enable_libtool_verbose=$enableval
-else
-  enable_libtool_verbose='no'
-fi
-
-
-if test "$enable_libtool_verbose" = 'no'; then
-    LIBTOOL="$LIBTOOL --silent"
-fi
-
 # Build a version of ImageMagick with assert statements.
 # Check whether --enable-assert was given.
 if test "${enable_assert+set}" = set; then

diff --git a/configure.ac b/configure.ac
index fbc67122e808ffb04dff2f435484b178aac8a1ce..c3bd26632fb025825af1ddaef8ebe900736c4d77 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -561,17 +561,6 @@ if test "$enable_hdri" = 'yes'; then
 fi
 AC_SUBST(MAGICK_HDRI)dnl
 
-# Enable verbose output from libtool (enable libtool's default)
-AC_ARG_ENABLE([libtool-verbose],
-    [AC_HELP_STRING([--enable-libtool-verbose],
-                    [enable verbose libtool output])],
-    [enable_libtool_verbose=$enableval],
-    [enable_libtool_verbose='no'])
-
-if test "$enable_libtool_verbose" = 'no'; then
-    LIBTOOL="$LIBTOOL --silent"
-fi
-
 # Build a version of ImageMagick with assert statements.
 AC_ARG_ENABLE([assert],
     [AC_HELP_STRING([--disable-assert],

diff --git a/magick/version.h b/magick/version.h
index c8eaa26e8ad6d1574e08b24150695d6defd9d97a..e3daffd6c3ba8a44687533755e203ff0fa13a8c5 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MagickLibVersionText  "6.5.7"
 #define MagickLibVersionNumber  2,0,0
 #define MagickLibSubversion  "-0"
-#define MagickReleaseDate  "2009-10-14"
+#define MagickReleaseDate  "2009-10-15"
 #define MagickChangeDate   "20091014"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.7/index.html"