(no commit message)

diff --git a/Makefile.in b/Makefile.in
index 3401097f9f84e0b40b71148cfb9d99b5dfcc43f6..4f96d6741a99297874d2247b10cfd4cdd9aca20e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2221,7 +2221,6 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AUTOTRACE_CFLAGS = @AUTOTRACE_CFLAGS@
 AUTOTRACE_LIBS = @AUTOTRACE_LIBS@
-AVIDecodeDelegate = @AVIDecodeDelegate@
 AWK = @AWK@
 AutotraceDecodeDelegate = @AutotraceDecodeDelegate@
 BIN_DIR = @BIN_DIR@

diff --git a/config/configure.xml b/config/configure.xml
index 31ffb0135708e082a56743d73c2a865d39077636..0f19450af211e44352ea33475d1a2b8b1e425540 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x666"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,6,1"/>
-  <configure name="RELEASE_DATE" value="2010-11-27"/>
+  <configure name="RELEASE_DATE" value="2010-11-28"/>
   <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 74b287de34bbbc96d073cee5c1cf34f072f8d505..be53c6fcf916b4fd2238a7acf8590172cf98ac47 100644 (file)
--- a/config/delegates.xml
+++ b/config/delegates.xml
@@ -60,7 +60,6 @@
 -->
 <delegatemap>
   <delegate decode="autotrace" stealth="True" command="&quot;convert&quot; &quot;%i&quot; &quot;pnm:%u&quot;\n&quot;autotrace&quot; -input-format pnm -output-format svg -output-file &quot;%o&quot; &quot;%u&quot;"/>
-  <delegate decode="avi:decode" stealth="True" command="&quot;mplayer&quot; &quot;%i&quot; -really-quiet -ao null -vo png:z=3"/>
   <delegate decode="blender" command="&quot;blender&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
   <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/"/>
   <delegate decode="cdr" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>

diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index 46b1335b1067ae5c8f8bc5eff72477831f59c05f..e32b8a4919f72f0415884827bd03b247dadd0125 100644 (file)
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -60,7 +60,6 @@
 -->
 <delegatemap>
   <delegate decode="autotrace" stealth="True" command="&quot;@ConvertDelegate@&quot; &quot;%i&quot; &quot;pnm:%u&quot;\n&quot;@AutotraceDecodeDelegate@&quot; -input-format pnm -output-format svg -output-file &quot;%o&quot; &quot;%u&quot;"/>
-  <delegate decode="avi:decode" stealth="True" command="&quot;@AVIDecodeDelegate@&quot; &quot;%i&quot; -really-quiet -ao null -vo png:z=3"/>
   <delegate decode="blender" command="&quot;@BlenderDecodeDelegate@&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;@ConvertDelegate@&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
   <delegate decode="browse" stealth="True" spawn="True" command="&quot;@BrowseDelegate@&quot; http://www.imagemagick.org/"/>
   <delegate decode="cdr" command="&quot;@UniconvertorDelegate@&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>

diff --git a/configure b/configure
index 8e2d332da26c6e413e70e71e3b2e16e3cab553b0..93313b0f22785946537a1f750efdfedd3971a9d9 100755 (executable)
--- a/configure
+++ b/configure
@@ -714,7 +714,6 @@ CGMDecodeDelegate
 BrowseDelegate
 BZIPDelegate
 BlenderDecodeDelegate
-AVIDecodeDelegate
 AutotraceDecodeDelegate
 SHARE_CONFIGURE_PATH
 SHARE_PATH
@@ -29485,7 +29484,6 @@ $as_echo_n "checking for ImageMagick delegate programs... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
 AutotraceDecodeDelegateDefault='autotrace'
-AVIDecodeDelegateDefault='mplayer'
 BlenderDecodeDelegateDefault='blender'
 BZIPDelegateDefault='bzip2'
 BrowseDelegateDefault='xdg-open'
@@ -29580,47 +29578,6 @@ $as_echo "no" >&6; }
 fi
 
 
-# Extract the first word of ""$AVIDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$AVIDecodeDelegateDefault"; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AVIDecodeDelegate+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $AVIDecodeDelegate in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AVIDecodeDelegate="$AVIDecodeDelegate" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_AVIDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_AVIDecodeDelegate" && ac_cv_path_AVIDecodeDelegate=""$AVIDecodeDelegateDefault""
-  ;;
-esac
-fi
-AVIDecodeDelegate=$ac_cv_path_AVIDecodeDelegate
-if test -n "$AVIDecodeDelegate"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AVIDecodeDelegate" >&5
-$as_echo "$AVIDecodeDelegate" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 # Extract the first word of ""$BlenderDecodeDelegateDefault"", so it can be a program name with args.
 set dummy "$BlenderDecodeDelegateDefault"; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -31491,7 +31448,6 @@ have_fig2dev='no'    ; if test "$FIGDecodeDelegate" != "$FIGDecodeDelegateDefaul
 have_gs='no'         ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
 have_hp2xx='no'      ; if test "$HPGLDecodeDelegate" !=  "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
 have_ilbmtoppm='no'  ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
-have_mplayer='no'; if test "$AVIDecodeDelegate" != "$AVIDecodeDelegateDefault" ; then have_mplayer='yes'; fi
 have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi
 have_pcl='no'        ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi
 have_ppmtoilbm='no'  ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi
@@ -31605,7 +31561,6 @@ esac
 if test "$with_frozenpaths" != 'yes'; then
   # Re-set delegate definitions to default (no paths)
   AutotraceDecodeDelegate="$AutotraceDecodeDelegateDefault"
-  AVIDecodeDelegate="$AVIDecodeDelegateDefault"
   BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
   BZIPDelegate="$BZIPDelegateDefault"
   BrowseDelegate="$BrowseDelegateDefault"
@@ -31694,7 +31649,6 @@ fi
 
 
 
-
 
 
 #

diff --git a/configure.ac b/configure.ac
index 4fe572058166d012b1285c765e1d445aa909f7d1..5d385c5c5a7521a9b0abbbc1d76f68d00b978328 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2704,7 +2704,6 @@ AC_MSG_RESULT([-------------------------------------------------------------])
 AC_MSG_CHECKING([for ImageMagick delegate programs])
 AC_MSG_RESULT([])
 AutotraceDecodeDelegateDefault='autotrace'
-AVIDecodeDelegateDefault='mplayer'
 BlenderDecodeDelegateDefault='blender'
 BZIPDelegateDefault='bzip2'
 BrowseDelegateDefault='xdg-open'
@@ -2759,7 +2758,6 @@ ZipDelegateDefault='gzip'
 
 # Search for delegates
 AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$AutotraceDecodeDelegateDefault")
-AC_PATH_PROG(AVIDecodeDelegate, "$AVIDecodeDelegateDefault", "$AVIDecodeDelegateDefault")
 AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
 AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault")
 AC_PATH_PROG(BrowseDelegate, "$BrowseDelegateDefault" mozilla firefox netscape, "$BrowseDelegateDefault")
@@ -2825,7 +2823,6 @@ have_fig2dev='no'    ; if test "$FIGDecodeDelegate" != "$FIGDecodeDelegateDefaul
 have_gs='no'         ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
 have_hp2xx='no'      ; if test "$HPGLDecodeDelegate" !=  "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
 have_ilbmtoppm='no'  ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
-have_mplayer='no'; if test "$AVIDecodeDelegate" != "$AVIDecodeDelegateDefault" ; then have_mplayer='yes'; fi
 have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi
 have_pcl='no'        ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi
 have_ppmtoilbm='no'  ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi
@@ -2933,7 +2930,6 @@ AC_SUBST(type_include_files)
 if test "$with_frozenpaths" != 'yes'; then
   # Re-set delegate definitions to default (no paths)
   AutotraceDecodeDelegate="$AutotraceDecodeDelegateDefault"
-  AVIDecodeDelegate="$AVIDecodeDelegateDefault"
   BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
   BZIPDelegate="$BZIPDelegateDefault"
   BrowseDelegate="$BrowseDelegateDefault"
@@ -2981,7 +2977,6 @@ fi
 
 # Delegate substitutions
 AC_SUBST(AutotraceDecodeDelegate)
-AC_SUBST(AVIDecodeDelegate)
 AC_SUBST(BlenderDecodeDelegate)
 AC_SUBST(BZIPDelegate)
 AC_SUBST(BrowseDelegate)

diff --git a/images/cylinder_shaded.png b/images/cylinder_shaded.png
index e5347ae86aa079e833e60f2cae54bd9eb5818844..478750107a0b65dcb9cee747cfeedaf6d0d970a4 100644 (file)
Binary files a/images/cylinder_shaded.png and b/images/cylinder_shaded.png differ

diff --git a/magick/version.h b/magick/version.h
index 4e8b0bfa8caa4414c9da3e630bff1587fb872e3f..5b7f48c3e0cc7060c6e100dbfe3fdc35f589362e 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,7 +33,7 @@ extern "C" {
 #define MagickLibAddendum  "-1"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-11-27"
+#define MagickReleaseDate  "2010-11-28"
 #define MagickChangeDate   "20101127"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)