From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 11 Oct 2010 00:45:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8697
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56dd2cd0c16c8fe059d7fff3f24ea384174c7bce;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index d24eb6e8a..bd58a019d 100644
--- 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 491f5748f..4b9c2403c 100644
--- 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") },