diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2013-09-30 00:39:51 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2014-04-12 14:52:07 -0400 |
| commit | a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed (patch) | |
| tree | 671fe96e5e69728dfeaeecc9bcafa41bfdd86579 /libavcodec/tiff.h | |
| parent | fdbe18b7b0545f9b5923d25a5433e4f735719ecc (diff) | |
| download | ffmpeg-a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed.tar.gz | |
tiff: use a better name and enum values for PhotometricInterpretation
Also add additional known values and log as missing features.
Diffstat (limited to 'libavcodec/tiff.h')
| -rw-r--r-- | libavcodec/tiff.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index 9052d2f046..8a3f7f75eb 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -37,7 +37,7 @@ enum TiffTags { TIFF_HEIGHT, TIFF_BPP, TIFF_COMPR, - TIFF_INVERT = 0x106, + TIFF_PHOTOMETRIC = 0x106, TIFF_FILL_ORDER = 0x10A, TIFF_STRIP_OFFS = 0x111, TIFF_SAMPLES_PER_PIXEL = 0x115, @@ -82,6 +82,24 @@ enum TiffTypes { TIFF_RATIONAL, }; +enum TiffPhotometric { + TIFF_PHOTOMETRIC_NONE = -1, + TIFF_PHOTOMETRIC_WHITE_IS_ZERO, /* mono or grayscale, 0 is white */ + TIFF_PHOTOMETRIC_BLACK_IS_ZERO, /* mono or grayscale, 0 is black */ + TIFF_PHOTOMETRIC_RGB, /* RGB or RGBA*/ + TIFF_PHOTOMETRIC_PALETTE, /* Uses a palette */ + TIFF_PHOTOMETRIC_ALPHA_MASK, /* Transparency mask */ + TIFF_PHOTOMETRIC_SEPARATED, /* CMYK or some other ink set */ + TIFF_PHOTOMETRIC_YCBCR, /* YCbCr */ + TIFF_PHOTOMETRIC_CIE_LAB = 8, /* 1976 CIE L*a*b* */ + TIFF_PHOTOMETRIC_ICC_LAB, /* ICC L*a*b* */ + TIFF_PHOTOMETRIC_ITU_LAB, /* ITU L*a*b* */ + TIFF_PHOTOMETRIC_CFA = 32803, /* Color Filter Array (DNG) */ + TIFF_PHOTOMETRIC_LOG_L = 32844, /* CIE Log2(L) */ + TIFF_PHOTOMETRIC_LOG_LUV, /* CIE Log L*u*v* */ + TIFF_PHOTOMETRIC_LINEAR_RAW = 34892, /* Linear Raw (DNG) */ +}; + /** sizes of various TIFF field types (string size = 100)*/ static const uint8_t type_sizes[6] = { 0, 1, 100, 2, 4, 8 |