Changeset 382

Timestamp:

10/15/09 12:17:14 (5 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• Magick++/lib/Magick++/STL.h (modified) (1 diff)
• Magick++/lib/STL.cpp (modified) (1 diff)
• config/configure.xml (modified) (1 diff)
• configure (modified) (15 diffs)
• configure.ac (modified) (1 diff)
• magick/version.h (modified) (1 diff)

ImageMagick/trunk/Magick++/lib/Magick++/STL.h

@@ -953 +953 @@
   {
   public:
-    shadeImage( const double clusterThreshold_ = 1.0, 
-    const double smoothingThreshold_ = 1.5 );
-
-    void operator()( Image &image_ ) const;
-
-  private:
-    double  _clusterThreshold;
-    double  _smoothingThreshold;
+    shadeImage( const double azimuth_ = 30,
+    const double elevation_ = 30,
+    const bool   colorShading_ = false );
+
+    void operator()( Image &image_ ) const;
+
+  private:
+    double  _azimuth;
+    double  _elevation;
+    bool    _colorShading;
   };
 

ImageMagick/trunk/Magick++/lib/STL.cpp

@@ -876 +876 @@
 
 // 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_)
 {
 }

ImageMagick/trunk/config/configure.xml

@@ -10 +10 @@
   <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"/>

ImageMagick/trunk/configure

@@ -1246 +1246 @@
 enable_embeddable
 enable_hdri
-enable_libtool_verbose
 enable_assert
 enable_maintainer_mode
@@ -1978 +1977 @@
   --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
@@ -9185 +9182 @@
   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
@@ -10382 +10379 @@
 *-*-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
@@ -12785 +12782 @@
    -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
@@ -13124 +13121 @@
    -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
@@ -13229 +13226 @@
    -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
@@ -13284 +13281 @@
    -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
@@ -16087 +16084 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 16089 "configure"
+#line 16086 "configure"
 #include "confdefs.h"
 
@@ -16183 +16180 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 16185 "configure"
+#line 16182 "configure"
 #include "confdefs.h"
 
@@ -18203 +18200 @@
    -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
@@ -18302 +18299 @@
    -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
@@ -18354 +18351 @@
    -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
@@ -20277 +20274 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 20279 "configure"
+#line 20276 "configure"
 #include "confdefs.h"
 
@@ -21681 +21678 @@
 _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
 

ImageMagick/trunk/configure.ac

@@ -562 +562 @@
 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],

ImageMagick/trunk/magick/version.h

@@ -32 +32 @@
 #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"