From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 15 Sep 2014 15:10:42 +0000 (+0000)
Subject: more Web/P fixes, remove dup entry from images
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb4007cd421ae4851ad4980a2d8cb5eb7348bc7e;p=file

more Web/P fixes, remove dup entry from images
---

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 94264047..161b6945 100644
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.93 2014/09/13 20:17:14 christos Exp $
+# $File: images,v 1.94 2014/09/15 15:10:42 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -976,6 +976,6 @@
 0	string	\x46\x4d\x52\x00	ISO/IEC 19794-2 Format Minutiae Record (FMR)
 
 # WEBP https://developers.google.com/speed/webp/docs/riff_container
-0	string	RIFF
->8	string	WEBP	Web/P image data
->>4	lelong	x	\b, %d bytes
+#0	string	RIFF
+#>8	string	WEBP	Web/P image data
+#>>4	lelong	x	\b, %d bytes
diff --git a/magic/Magdir/riff b/magic/Magdir/riff
index 2a277b8f..f89acc4d 100644
--- a/magic/Magdir/riff
+++ b/magic/Magdir/riff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: riff,v 1.28 2014/09/13 14:04:21 christos Exp $
+# $File: riff,v 1.29 2014/09/15 15:10:42 christos Exp $
 # riff:  file(1) magic for RIFF format
 # See
 #
@@ -46,11 +46,19 @@
 >0  string  fact
 >>&(4.l+4)  use riff-walk
 >0  string  VP8
->>11	byte	0x9d
->>>10	byte	0x01
->>>>13	byte	0x2a	\b, VP8 encoding
->>>>>14	leshort&0x3fff	x	\b, %d
->>>>>16	leshort&0x3fff	x	\bx%d
+>>11		byte		0x9d
+>>>12		byte		0x01
+>>>>13		byte		0x2a	\b, VP8 encoding
+>>>>>14		leshort&0x3fff	x	\b, %d
+>>>>>16		leshort&0x3fff	x	\bx%d, Scaling:
+>>>>>14		leshort&0xc000	0x0000	\b [none]
+>>>>>14		leshort&0xc000	0x1000	\b [5/4]
+>>>>>14		leshort&0xc000	0x2000	\b [5/3]
+>>>>>14		leshort&0xc000	0x3000	\b [2]
+>>>>>14		leshort&0xc000	0x0000	\bx[none]
+>>>>>14		leshort&0xc000	0x1000	\bx[5/4]
+>>>>>14		leshort&0xc000	0x2000	\bx[5/3]
+>>>>>14		leshort&0xc000	0x3000	\bx[2]
 #>0  string  x		we got %s
 #>>&(4.l+4)  use riff-walk
 
@@ -217,7 +225,7 @@
 >8	string		4XMV		\b, 4X Movie file 
 # AMV-type AVI file: http://wiki.multimedia.cx/index.php?title=AMV
 >8	string		AMV\040		\b, AMV 
->8      string          WEBP            \b, WEBP image
+>8      string          WEBP            \b, Web/P image
 >>12	use		riff-walk
 
 #
@@ -294,4 +302,3 @@
 >>&6	leshort		=2		\b, stereo
 >>&6	leshort		>2		\b, %d channels
 >>&8	lelong		>0		%d Hz
-