From 8ee08a881a14ef74d3ea5cea548c8ad8059bdb2d Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Thu, 24 Mar 2022 10:38:34 +0900 Subject: [PATCH] minor change --- .../thibault/aves/metadata/ExifTags.kt | 73 ++++++------------- 1 file changed, 22 insertions(+), 51 deletions(-) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifTags.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifTags.kt index 34043d3bb..ddcf16ebd 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifTags.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/ExifTags.kt @@ -1,76 +1,47 @@ package deckers.thibault.aves.metadata -// Exif tags missing from `metadata-extractor` +/* +Exif tags missing from `metadata-extractor` + +Photoshop +https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/ +https://www.adobe.io/content/dam/udp/en/open/standards/tiff/TIFFphotoshop.pdf + */ object ExifTags { - // XPosition - // Tag = 286 (011E.H) private const val TAG_X_POSITION = 0x011e - - // YPosition - // Tag = 287 (011F.H) private const val TAG_Y_POSITION = 0x011f - - // ColorMap - // Tag = 320 (0140.H) + private const val TAG_T4_OPTIONS = 0x0124 + private const val TAG_T6_OPTIONS = 0x0125 private const val TAG_COLOR_MAP = 0x0140 - - // ExtraSamples - // Tag = 338 (0152.H) - // values: - // EXTRASAMPLE_UNSPECIFIED 0 // unspecified data - // EXTRASAMPLE_ASSOCALPHA 1 // associated alpha data - // EXTRASAMPLE_UNASSALPHA 2 // unassociated alpha data private const val TAG_EXTRA_SAMPLES = 0x0152 - - // SampleFormat - // Tag = 339 (0153.H) - // values: - // SAMPLEFORMAT_UINT 1 // unsigned integer data - // SAMPLEFORMAT_INT 2 // signed integer data - // SAMPLEFORMAT_IEEEFP 3 // IEEE floating point data - // SAMPLEFORMAT_VOID 4 // untyped data - // SAMPLEFORMAT_COMPLEXINT 5 // complex signed int - // SAMPLEFORMAT_COMPLEXIEEEFP 6 // complex ieee floating private const val TAG_SAMPLE_FORMAT = 0x0153 - - - // Rating tag used by Windows, value in percent - // Tag = 18249 (4749.H) - // Type = SHORT private const val TAG_RATING_PERCENT = 0x4749 - - /* - SGI - tags 32995-32999 - */ - - // Matteing - // Tag = 32995 (80E3.H) - // obsoleted by the 6.0 ExtraSamples (338) + private const val SONY_RAW_FILE_TYPE = 0x7000 + private const val SONY_TONE_CURVE = 0x7010 private const val TAG_MATTEING = 0x80e3 - /* - Photoshop - https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/ - https://www.adobe.io/content/dam/udp/en/open/standards/tiff/TIFFphotoshop.pdf - */ - - // ImageSourceData - // Tag = 37724 (935C.H) - // Type = UNDEFINED + // sensing method (0x9217) redundant with sensing method (0xA217) + private const val TAG_SENSING_METHOD = 0x9217 private const val TAG_IMAGE_SOURCE_DATA = 0x935c + private const val TAG_GDAL_METADATA = 0xa480 + private const val TAG_GDAL_NO_DATA = 0xa481 private val tagNameMap = hashMapOf( TAG_X_POSITION to "X Position", TAG_Y_POSITION to "Y Position", + TAG_T4_OPTIONS to "T4 Options", + TAG_T6_OPTIONS to "T6 Options", TAG_COLOR_MAP to "Color Map", TAG_EXTRA_SAMPLES to "Extra Samples", TAG_SAMPLE_FORMAT to "Sample Format", TAG_RATING_PERCENT to "Rating Percent", - // SGI + SONY_RAW_FILE_TYPE to "Sony Raw File Type", + SONY_TONE_CURVE to "Sony Tone Curve", TAG_MATTEING to "Matteing", - // Photoshop + TAG_SENSING_METHOD to "Sensing Method (0x9217)", TAG_IMAGE_SOURCE_DATA to "Image Source Data", + TAG_GDAL_METADATA to "GDAL Metadata", + TAG_GDAL_NO_DATA to "GDAL No Data", ).apply { putAll(DngTags.tagNameMap) putAll(GeoTiffTags.tagNameMap)