summaryrefslogtreecommitdiff
path: root/magic/Magdir/images
diff options
context:
space:
mode:
Diffstat (limited to 'magic/Magdir/images')
-rw-r--r--magic/Magdir/images82
1 files changed, 57 insertions, 25 deletions
diff --git a/magic/Magdir/images b/magic/Magdir/images
index f0d087b3b4b6b..fe857f2b8cf3e 100644
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: images,v 1.126 2017/06/11 22:25:44 christos Exp $
+# $File: images,v 1.131 2018/02/16 15:44:28 christos Exp $
# images: file(1) magic for image formats (see also "iff", and "c-lang" for
# XPM bitmaps)
#
@@ -27,27 +27,23 @@
# and Image Type 1 2 3 9 10 11 32 33
# and Color Map Entry Size 0 15 16 24 32
0 ubequad&0x00FeC400000000C0 0
-# skip more garbage by looking for positive image type
+# skip more garbage like *.iso by looking for positive image type
>2 ubyte >0
-# skip some compiled terminfo by looking for image type less equal 33
+# skip some compiled terminfo like xterm+tmux by looking for image type less equal 33
>>2 ubyte <34
-# skip arches.3200 , Finder.Root , Slp.1 by looking for low pixel sizes 15 16 24 32
->>>16 ubyte <33
-# skip more by looking for pixel size 0Fh 10h 18h 20h
->>>>16 ubyte&0xC0 0x00
-# Color Map
->>>>>1 belong&0xfff7ffff 0x01010000
->>>>>>0 use tga-image
->>>>>1 belong&0xfff7ffff 0x00020000
->>>>>>0 use tga-image
->>>>>1 belong&0xfff7ffff 0x00030000
->>>>>>0 use tga-image
->>>>>1 default x
-# skip 260-16.ico by looking for no color map
->>>>>>1 ubyte 0
-# implies no first map entry
->>>>>>>3 uleshort 0
->>>>>>>>0 use tga-image
+# skip arches.3200 , Finder.Root , Slp.1 by looking for low pixel depth 1 8 15 16 24 32
+>>>16 ubyte 1
+>>>>0 use tga-image
+>>>16 ubyte 8
+>>>>0 use tga-image
+>>>16 ubyte 15
+>>>>0 use tga-image
+>>>16 ubyte 16
+>>>>0 use tga-image
+>>>16 ubyte 24
+>>>>0 use tga-image
+>>>16 ubyte 32
+>>>>0 use tga-image
# display tga bitmap image information
0 name tga-image
>2 ubyte <34 Targa image data
@@ -81,7 +77,7 @@
# image height. 0 interpreted as 65536
>14 uleshort >0 %d
>14 uleshort =0 65536
-# Image Pixel Size 15 16 24 32
+# Image Pixel depth 1 8 15 16 24 32
>16 ubyte x x %d
# X origin of image. 0 normal
>8 uleshort >0 +%d
@@ -752,7 +748,7 @@
>5 byte 0x00 (white background)
>5 byte 0xFF (black background)
-# Gurkan Sengun <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+# From: Alex Myczko <alex@aiei.ch>
# http://www.atarimax.com/jindroush.atari.org/afmtatr.html
0 leshort 0x0296 Atari ATR image
@@ -1065,7 +1061,9 @@
>>&16 byte 5 pxr24
>>&16 byte 6 b44
>>&16 byte 7 b44a
->>&16 byte >7 unknown
+>>&16 byte 8 dwaa
+>>&16 byte 9 dwab
+>>&16 byte >9 unknown
>8 search/0x1000 dataWindow\0 \b, dataWindow:
>>&10 lelong x (%d
>>&14 lelong x %d)-
@@ -1087,8 +1085,15 @@
# ANSI/SMPTE 268M-1994, SMPTE Standard for File Format for Digital
# Moving-Picture Exchange (DPX), v1.0, 18 February 1994
# Robert Minsk <robertminsk at yahoo.com>
+# Modified by Harry Mallon <hjmallon at gmail.com>
0 string SDPX DPX image data, big-endian,
!:mime image/x-dpx
+>0 use dpx_info
+0 string XPDS DPX image data, little-endian,
+!:mime image/x-dpx
+>0 use \^dpx_info
+
+0 name dpx_info
>768 beshort <4
>>772 belong x %dx
>>776 belong x \b%d,
@@ -1101,8 +1106,8 @@
>768 beshort 3 right to left/bottom to top
>768 beshort 4 top to bottom/left to right
>768 beshort 5 top to bottom/right to left
->768 leshort 6 bottom to top/left to right
->768 leshort 7 bottom to top/right to left
+>768 beshort 6 bottom to top/left to right
+>768 beshort 7 bottom to top/right to left
# From: Tom Hilinski <tom.hilinski@comcast.net>
# http://www.unidata.ucar.edu/packages/netcdf/
@@ -1479,3 +1484,30 @@
>4 belong 0x0D0A1A0A
>12 belong 0x00000000 Lytro Light Field Picture
>8 belong x \b, version %d
+
+# Type: Vision Research Phantom CINE Format
+# URL: https://www.phantomhighspeed.com/
+# URL2: http://phantomhighspeed.force.com/vriknowledge/servlet/fileField?id=0BEU0000000Cfyk
+# From: Harry Mallon <hjmallon at gmail.com>
+#
+# This has a short "CI" code but the 44 is the size of the struct which is
+# stable
+0 string CI
+>2 leshort 44 Vision Research CINE Video,
+>>4 leshort 0 Grayscale,
+>>4 leshort 1 JPEG Compressed,
+>>4 leshort 2 RAW,
+>>6 leshort x version %d,
+>>20 lelong x %d frames,
+>>48 lelong x %dx
+>>52 lelong x \b%d
+
+# Type: ARRI Raw Image
+# Info: SMPTE RDD30:2014
+# From: Harry Mallon <hjmallon at gmail.com>
+0 string ARRI ARRI ARI image data,
+>4 lelong 0x78563412 little-endian,
+>4 lelong 0x12345678 big-endian,
+>12 lelong x version %d,
+>20 lelong x %dx
+>24 lelong x \b%d