diff options
author | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2009-01-02 03:10:55 +0000 |
commit | 729acffa050ba99227c27884a5760fdd3d6959b2 (patch) | |
tree | d5289d633f1b84fbbf947f98b34ff58109fccca7 /contrib/file/Magdir/jpeg | |
parent | 964611a3050b11c026667dbb4ae98380fe18252a (diff) | |
parent | 05dd1f1bd993ec12015e6782ea5c46b6a0b69ecb (diff) | |
download | FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.zip FreeBSD-src-729acffa050ba99227c27884a5760fdd3d6959b2.tar.gz |
Record that base/vendor/file/dist@186675 was merged.
Merge base/vendor/file/dist@186675@186690, bringing FILE 4.26 to 8-CURRENT.
Diffstat (limited to 'contrib/file/Magdir/jpeg')
-rw-r--r-- | contrib/file/Magdir/jpeg | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/contrib/file/Magdir/jpeg b/contrib/file/Magdir/jpeg index af646d6..d728de6 100644 --- a/contrib/file/Magdir/jpeg +++ b/contrib/file/Magdir/jpeg @@ -9,6 +9,8 @@ # both of which turn into "JPEG image data" here. # 0 beshort 0xffd8 JPEG image data +!:mime image/jpeg +!:strength +1 >6 string JFIF \b, JFIF standard # The following added by Erik Rossen <rossen@freesurf.ch> 1999-09-06 # in a vain attempt to add image size reporting for JFIF. Note that these @@ -125,6 +127,8 @@ # At least we can show a comment if no other segments got inserted before: >(4.S+5) byte 0xFE >>(4.S+8) string >\0 \b, comment: "%s" +# FIXME: When we can do non-byte counted strings, we can use that to get +# the string's count, and fix Debian bug #283760 #>(4.S+5) byte 0xFE \b, comment #>>(4.S+6) beshort x \b length=%d #>>(4.S+8) string >\0 \b, "%s" @@ -153,3 +157,8 @@ # From: David Santinoli <david@santinoli.com> 0 string \x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A JPEG 2000 image data + +# Type: JPEG 2000 codesream +# From: Mathieu Malaterre <mathieu.malaterre@gmail.com> +0 belong 0xff4fff51 JPEG 2000 codestream +45 beshort 0xff52 |