Skip to content

Commit 1723532

Browse files
nigeltaonigeltao
committed
base: add ABXR, ABXS magic numbers
1 parent 86d16d9 commit 1723532

File tree

3 files changed

+56
-42
lines changed

3 files changed

+56
-42
lines changed

‎internal/cgen/base/magic-submodule.c

+24-21
Original file line numberDiff line numberDiff line change
@@ -145,27 +145,30 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix_data,
145145
int32_t fourcc;
146146
const char* magic;
147147
} table[] = {
148-
{-0x30302020, "\x01\x00\x00"}, // '00 'be
149-
{+0x475A2020, "\x02\x1F\x8B\x08"}, // GZ
150-
{+0x5A535444, "\x03\x28\xB5\x2F\xFD"}, // ZSTD
151-
{+0x425A3220, "\x02\x42\x5A\x68"}, // BZ2
152-
{+0x424D5020, "\x01\x42\x4D"}, // BMP
153-
{+0x47494620, "\x03\x47\x49\x46\x38"}, // GIF
154-
{+0x54494646, "\x03\x49\x49\x2A\x00"}, // TIFF (little-endian)
155-
{+0x4C5A4950, "\x04\x4C\x5A\x49\x50\x01"}, // LZIP
156-
{+0x54494646, "\x03\x4D\x4D\x00\x2A"}, // TIFF (big-endian)
157-
{+0x45544332, "\x03\x50\x4B\x4D\x20"}, // ETC2 (*.pkm)
158-
{+0x4E50424D, "\x02\x50\x35\x0A"}, // NPBM (P5; *.pgm)
159-
{+0x4E50424D, "\x02\x50\x36\x0A"}, // NPBM (P6; *.ppm)
160-
{-0x52494646, "\x03\x52\x49\x46\x46"}, // RIFF
161-
{+0x4C5A4D41, "\x04\x5D\x00\x10\x00\x00"}, // LZMA
162-
{+0x4C5A4D41, "\x02\x5D\x00\x00"}, // LZMA
163-
{+0x4E494520, "\x02\x6E\xC3\xAF"}, // NIE
164-
{+0x514F4920, "\x03\x71\x6F\x69\x66"}, // QOI
165-
{+0x5A4C4942, "\x01\x78\x9C"}, // ZLIB
166-
{+0x504E4720, "\x03\x89\x50\x4E\x47"}, // PNG
167-
{+0x585A2020, "\x04\xFD\x37\x7A\x58\x5A"}, // XZ
168-
{+0x4A504547, "\x01\xFF\xD8"}, // JPEG
148+
{-0x30302020, "\x01\x00\x00"}, // '00 'be
149+
{+0x41425852, "\x03\x03\x00\x08\x00"}, // ABXR
150+
{+0x475A2020, "\x02\x1F\x8B\x08"}, // GZ
151+
{+0x5A535444, "\x03\x28\xB5\x2F\xFD"}, // ZSTD
152+
{+0x584D4C20, "\x05\x3C\x3F\x78\x6D\x6C\x20"}, // XML
153+
{+0x41425853, "\x03\x41\x42\x58\x00"}, // ABXS
154+
{+0x425A3220, "\x02\x42\x5A\x68"}, // BZ2
155+
{+0x424D5020, "\x01\x42\x4D"}, // BMP
156+
{+0x47494620, "\x03\x47\x49\x46\x38"}, // GIF
157+
{+0x54494646, "\x03\x49\x49\x2A\x00"}, // TIFF (little-endian)
158+
{+0x4C5A4950, "\x04\x4C\x5A\x49\x50\x01"}, // LZIP
159+
{+0x54494646, "\x03\x4D\x4D\x00\x2A"}, // TIFF (big-endian)
160+
{+0x45544332, "\x03\x50\x4B\x4D\x20"}, // ETC2 (*.pkm)
161+
{+0x4E50424D, "\x02\x50\x35\x0A"}, // NPBM (P5; *.pgm)
162+
{+0x4E50424D, "\x02\x50\x36\x0A"}, // NPBM (P6; *.ppm)
163+
{-0x52494646, "\x03\x52\x49\x46\x46"}, // RIFF
164+
{+0x4C5A4D41, "\x04\x5D\x00\x10\x00\x00"}, // LZMA
165+
{+0x4C5A4D41, "\x02\x5D\x00\x00"}, // LZMA
166+
{+0x4E494520, "\x02\x6E\xC3\xAF"}, // NIE
167+
{+0x514F4920, "\x03\x71\x6F\x69\x66"}, // QOI
168+
{+0x5A4C4942, "\x01\x78\x9C"}, // ZLIB
169+
{+0x504E4720, "\x03\x89\x50\x4E\x47"}, // PNG
170+
{+0x585A2020, "\x04\xFD\x37\x7A\x58\x5A"}, // XZ
171+
{+0x4A504547, "\x01\xFF\xD8"}, // JPEG
169172
};
170173
static const size_t table_len = sizeof(table) / sizeof(table[0]);
171174

‎lang/builtin/builtin.go

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
)
2525

2626
var FourCCs = [...][2]string{
27+
{"ABXR", "Android Binary XML (for resources; see AndroidBinXmlParser.java)"},
28+
{"ABXS", "Android Binary XML (for system_server; see BinaryXmlSerializer.java)"},
2729
{"BGCL", "Background Color"},
2830
{"BMP ", "Bitmap"},
2931
{"BRTL", "Brotli"},

‎release/c/wuffs-unsupported-snapshot.c

+30-21
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,12 @@ typedef struct wuffs_base__transform__output__struct {
754754
// Wuffs' u32 values are big-endian ("JPEG" is 0x4A504547 not 0x4745504A) to
755755
// preserve ordering: "JPEG" < "MP3 " and 0x4A504547 < 0x4D503320.
756756

757+
// Android Binary XML (for resources; see AndroidBinXmlParser.java).
758+
#define WUFFS_BASE__FOURCC__ABXR 0x41425852
759+
760+
// Android Binary XML (for system_server; see BinaryXmlSerializer.java).
761+
#define WUFFS_BASE__FOURCC__ABXS 0x41425853
762+
757763
// Background Color.
758764
#define WUFFS_BASE__FOURCC__BGCL 0x4247434C
759765

@@ -22363,27 +22369,30 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix_data,
2236322369
int32_t fourcc;
2236422370
const char* magic;
2236522371
} table[] = {
22366-
{-0x30302020, "\x01\x00\x00"}, // '00 'be
22367-
{+0x475A2020, "\x02\x1F\x8B\x08"}, // GZ
22368-
{+0x5A535444, "\x03\x28\xB5\x2F\xFD"}, // ZSTD
22369-
{+0x425A3220, "\x02\x42\x5A\x68"}, // BZ2
22370-
{+0x424D5020, "\x01\x42\x4D"}, // BMP
22371-
{+0x47494620, "\x03\x47\x49\x46\x38"}, // GIF
22372-
{+0x54494646, "\x03\x49\x49\x2A\x00"}, // TIFF (little-endian)
22373-
{+0x4C5A4950, "\x04\x4C\x5A\x49\x50\x01"}, // LZIP
22374-
{+0x54494646, "\x03\x4D\x4D\x00\x2A"}, // TIFF (big-endian)
22375-
{+0x45544332, "\x03\x50\x4B\x4D\x20"}, // ETC2 (*.pkm)
22376-
{+0x4E50424D, "\x02\x50\x35\x0A"}, // NPBM (P5; *.pgm)
22377-
{+0x4E50424D, "\x02\x50\x36\x0A"}, // NPBM (P6; *.ppm)
22378-
{-0x52494646, "\x03\x52\x49\x46\x46"}, // RIFF
22379-
{+0x4C5A4D41, "\x04\x5D\x00\x10\x00\x00"}, // LZMA
22380-
{+0x4C5A4D41, "\x02\x5D\x00\x00"}, // LZMA
22381-
{+0x4E494520, "\x02\x6E\xC3\xAF"}, // NIE
22382-
{+0x514F4920, "\x03\x71\x6F\x69\x66"}, // QOI
22383-
{+0x5A4C4942, "\x01\x78\x9C"}, // ZLIB
22384-
{+0x504E4720, "\x03\x89\x50\x4E\x47"}, // PNG
22385-
{+0x585A2020, "\x04\xFD\x37\x7A\x58\x5A"}, // XZ
22386-
{+0x4A504547, "\x01\xFF\xD8"}, // JPEG
22372+
{-0x30302020, "\x01\x00\x00"}, // '00 'be
22373+
{+0x41425852, "\x03\x03\x00\x08\x00"}, // ABXR
22374+
{+0x475A2020, "\x02\x1F\x8B\x08"}, // GZ
22375+
{+0x5A535444, "\x03\x28\xB5\x2F\xFD"}, // ZSTD
22376+
{+0x584D4C20, "\x05\x3C\x3F\x78\x6D\x6C\x20"}, // XML
22377+
{+0x41425853, "\x03\x41\x42\x58\x00"}, // ABXS
22378+
{+0x425A3220, "\x02\x42\x5A\x68"}, // BZ2
22379+
{+0x424D5020, "\x01\x42\x4D"}, // BMP
22380+
{+0x47494620, "\x03\x47\x49\x46\x38"}, // GIF
22381+
{+0x54494646, "\x03\x49\x49\x2A\x00"}, // TIFF (little-endian)
22382+
{+0x4C5A4950, "\x04\x4C\x5A\x49\x50\x01"}, // LZIP
22383+
{+0x54494646, "\x03\x4D\x4D\x00\x2A"}, // TIFF (big-endian)
22384+
{+0x45544332, "\x03\x50\x4B\x4D\x20"}, // ETC2 (*.pkm)
22385+
{+0x4E50424D, "\x02\x50\x35\x0A"}, // NPBM (P5; *.pgm)
22386+
{+0x4E50424D, "\x02\x50\x36\x0A"}, // NPBM (P6; *.ppm)
22387+
{-0x52494646, "\x03\x52\x49\x46\x46"}, // RIFF
22388+
{+0x4C5A4D41, "\x04\x5D\x00\x10\x00\x00"}, // LZMA
22389+
{+0x4C5A4D41, "\x02\x5D\x00\x00"}, // LZMA
22390+
{+0x4E494520, "\x02\x6E\xC3\xAF"}, // NIE
22391+
{+0x514F4920, "\x03\x71\x6F\x69\x66"}, // QOI
22392+
{+0x5A4C4942, "\x01\x78\x9C"}, // ZLIB
22393+
{+0x504E4720, "\x03\x89\x50\x4E\x47"}, // PNG
22394+
{+0x585A2020, "\x04\xFD\x37\x7A\x58\x5A"}, // XZ
22395+
{+0x4A504547, "\x01\xFF\xD8"}, // JPEG
2238722396
};
2238822397
static const size_t table_len = sizeof(table) / sizeof(table[0]);
2238922398

0 commit comments

Comments
 (0)