Deleted Added
full compact
3c3
< # $File: images,v 1.91 2014/04/30 21:41:02 christos Exp $
---
> # $File: images,v 1.97 2014/12/08 16:06:19 christos Exp $
117a118
> >(4.L) use tiff_ifd
119a121
> >(4.l) use tiff_ifd
120a123,204
> 0 name tiff_ifd
> >0 leshort x \b, direntries=%d
> >2 use tiff_entry
>
> 0 name tiff_entry
> >0 leshort 0x100
> >>4 lelong 1
> >>>12 use tiff_entry
> >>>8 lelong x \b, width=%d
> >0 leshort 0x101
> >>4 lelong 1
> >>>8 lelong x \b, height=%d
> >>>12 use tiff_entry
> >0 leshort 0x102
> >>8 lelong x \b, bps=%d
> >>12 use tiff_entry
> >0 leshort 0x103
> >>4 lelong 1 \b, compression=
> >>>8 lelong 1 \bnone
> >>>8 lelong 2 \bhuffman
> >>>8 lelong 3 \bbi-level group 3
> >>>8 lelong 4 \bbi-level group 4
> >>>8 lelong 5 \bLZW
> >>>8 lelong 6 \bJPEG (old)
> >>>8 lelong 7 \bJPEG
> >>>8 lelong 8 \bdeflate
> >>>8 lelong 9 \bJBIG, ITU-T T.85
> >>>8 lelong 0xa \bJBIG, ITU-T T.43
> >>>8 lelong 0x7ffe \bNeXT RLE 2-bit
> >>>8 lelong 0x8005 \bPackBits (Macintosh RLE)
> >>>8 lelong 0x8029 \bThunderscan RLE
> >>>8 lelong 0x807f \bRasterPadding (CT or MP)
> >>>8 lelong 0x8080 \bRLE (Line Work)
> >>>8 lelong 0x8081 \bRLE (High-Res Cont-Tone)
> >>>8 lelong 0x8082 \bRLE (Binary Line Work)
> >>>8 lelong 0x80b2 \bDeflate (PKZIP)
> >>>8 lelong 0x80b3 \bKodak DCS
> >>>8 lelong 0x8765 \bJBIG
> >>>8 lelong 0x8798 \bJPEG2000
> >>>8 lelong 0x8799 \bNikon NEF Compressed
> >>>8 default x
> >>>>8 lelong x \b(unknown 0x%x)
> >>>12 use tiff_entry
> >0 leshort 0x106 \b, PhotometricIntepretation=
> >>8 lelong 0 \bWhiteIsZero
> >>8 lelong 1 \bBlackIsZero
> >>8 lelong 2 \bRGB
> >>8 lelong 3 \bRGB Palette
> >>8 lelong 4 \bTransparency Mask
> >>8 lelong 5 \bCMYK
> >>8 lelong 6 \bYCbCr
> >>8 lelong 8 \bCIELab
> >>>8 lelong x \b(unknown=0x%x)
> >>12 use tiff_entry
> # FillOrder
> >0 leshort 0x10a
> >>4 lelong 1
> >>>12 use tiff_entry
> # DocumentName
> >0 leshort 0x10d
> >>(8.l) string x \b, name=%s
> >>>12 use tiff_entry
> # ImageDescription
> >0 leshort 0x10e
> >>(8.l) string x \b, description=%s
> >>>12 use tiff_entry
> # StripOffsets
> >0 leshort 0x111
> >>12 use tiff_entry
> # NewSubFileType
> >0 leshort 0xfe
> >>12 use tiff_entry
> # Datetime
> >0 leshort 0x132
> >>(8.l) string x \b, datetime=%s
> >>>12 use tiff_entry
> # HostComputer
> >0 leshort 0x13c
> >>(8.l) string x \b, hostcomputer=%s
> >>>12 use tiff_entry
> #>0 leshort x \b, unknown=0x%x
>
895,897c979,1040
< 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
>
> # doc: http://www.shikino.co.jp/eng/products/images/FLOWER.jpg.zip
> # example: http://www.shikino.co.jp/eng/products/images/FLOWER.wdp.zip
> 90 bequad 0x574D50484F544F00 JPEG-XR Image
> >98 byte&0x08 =0x08 \b, hard tiling
> >99 byte&0x80 =0x80 \b, tiling present
> >99 byte&0x40 =0x40 \b, codestream present
> >99 byte&0x38 x \b, spatial xform=
> >99 byte&0x38 0x00 \bTL
> >99 byte&0x38 0x08 \bBL
> >99 byte&0x38 0x10 \bTR
> >99 byte&0x38 0x18 \bBR
> >99 byte&0x38 0x20 \bBT
> >99 byte&0x38 0x28 \bRB
> >99 byte&0x38 0x30 \bLT
> >99 byte&0x38 0x38 \bLB
> >100 byte&0x80 =0x80 \b, short header
> >>102 beshort+1 x \b, %d
> >>104 beshort+1 x \bx%d
> >100 byte&0x80 =0x00 \b, long header
> >>102 belong+1 x \b, %x
> >>106 belong+1 x \bx%x
> >101 beshort&0xf x \b, bitdepth=
> >>101 beshort&0xf 0x0 \b1-WHITE=1
> >>101 beshort&0xf 0x1 \b8
> >>101 beshort&0xf 0x2 \b16
> >>101 beshort&0xf 0x3 \b16-SIGNED
> >>101 beshort&0xf 0x4 \b16-FLOAT
> >>101 beshort&0xf 0x5 \b(reserved 5)
> >>101 beshort&0xf 0x6 \b32-SIGNED
> >>101 beshort&0xf 0x7 \b32-FLOAT
> >>101 beshort&0xf 0x8 \b5
> >>101 beshort&0xf 0x9 \b10
> >>101 beshort&0xf 0xa \b5-6-5
> >>101 beshort&0xf 0xb \b(reserved %d)
> >>101 beshort&0xf 0xc \b(reserved %d)
> >>101 beshort&0xf 0xd \b(reserved %d)
> >>101 beshort&0xf 0xe \b(reserved %d)
> >>101 beshort&0xf 0xf \b1-BLACK=1
> >101 beshort&0xf0 x \b, colorfmt=
> >>101 beshort&0xf0 0x00 \bYONLY
> >>101 beshort&0xf0 0x10 \bYUV240
> >>101 beshort&0xf0 0x20 \bYWV422
> >>101 beshort&0xf0 0x30 \bYWV444
> >>101 beshort&0xf0 0x40 \bCMYK
> >>101 beshort&0xf0 0x50 \bCMYKDIRECT
> >>101 beshort&0xf0 0x60 \bNCOMPONENT
> >>101 beshort&0xf0 0x70 \bRGB
> >>101 beshort&0xf0 0x80 \bRGBE
> >>101 beshort&0xf0 >0x80 \b(reserved 0x%x)
>
> # From: Johan van der Knijff <johan.vanderknijff@kb.nl>
> #
> # BPG (Better Portable Graphics) format
> # http://bellard.org/bpg/
> # http://fileformats.archiveteam.org/wiki/BPG
> #
> 0 string \x42\x50\x47\xFB BPG (Better Portable Graphics)
> !:mime image/bpg