(no commit message)

diff --git a/ChangeLog b/ChangeLog
index d24eb6e8a3447208e0ef066336ee31444df31dab..bd58a019d89a841d8779a4f492f27aec86f9672d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,7 @@
 2010-10-10  6.6.5-0 Cristy  <quetzlzacatenango@image...>
   * Patch for  DrawableRotation() and DrawableTranslation() (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=17246).
-  * The webp format requires the webpconv delegate program and an explicit
-    format (e.g. convert webp:image.webp image.png).
+  * The webp format requires the webpconv delegate program (experimental).
 
 2010-10-05  6.6.5-0 Anthony Thyssen <A.Thyssen@griffith...>
   * Replaced "Robidoux" with Cubic 'Keys' filter that is near equivelent to

diff --git a/magick/magic.c b/magick/magic.c
index 491f5748f66a6568e40a6004c44093a34d43a0c8..4b9c2403cefcca8ab0d66ed3b11e5257a576a52b 100644 (file)
--- a/magick/magic.c
+++ b/magick/magic.c
@@ -185,6 +185,7 @@ static const MagicMapInfo
     { "VICAR", 0, MagickString("LBLSIZE") },
     { "VICAR", 0, MagickString("NJPL1I") },
     { "VIFF", 0, MagickString("\253\001") },
+    { "WEBP", 8, MagickString("WEBP") },
     { "WMF", 0, MagickString("\327\315\306\232") },
     { "WMF", 0, MagickString("\001\000\011\000") },
     { "WPG", 0, MagickString("\377WPC") },