diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 03:45:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 03:45:45 +0200 |
| commit | b9b2f9d218bad3001edc64704865987fd7cf7dca (patch) | |
| tree | 2fa210c6ef3eba82b0e1cf67ae315903f81098fb /libavcodec/tiff.h | |
| parent | 75b4e4013796b26c8cc22fd9f9bec0cc8672c767 (diff) | |
| parent | a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed (diff) | |
| download | ffmpeg-b9b2f9d218bad3001edc64704865987fd7cf7dca.tar.gz | |
Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed'
* commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed':
tiff: use a better name and enum values for PhotometricInterpretation
Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 ae189b6fdd..11e9f1629d 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -40,7 +40,7 @@ enum TiffTags { TIFF_HEIGHT, TIFF_BPP, TIFF_COMPR, - TIFF_INVERT = 0x106, + TIFF_PHOTOMETRIC = 0x106, TIFF_FILL_ORDER = 0x10A, TIFF_DOCUMENT_NAME = 0x10D, TIFF_IMAGE_DESCRIPTION = 0x10E, @@ -146,6 +146,24 @@ enum TiffGeoTagKey { TIFF_VERTICAL_UNITS_GEOKEY = 4099 }; +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) */ +}; + enum TiffGeoTagType { GEOTIFF_SHORT = 0, GEOTIFF_DOUBLE = 34736, |