diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2023-05-28 10:11:29 +0200 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2023-05-28 10:13:04 +0200 |
| commit | a71069272599888742c70f832898094744ddb6dc (patch) | |
| tree | c41b8fded11b71338960644a29105fa5a3dd69d1 /tools/info.h | |
| parent | 859736e5be7746ef90535754e37a3a8ec87dfd5e (diff) | |
| download | fiv-a71069272599888742c70f832898094744ddb6dc.tar.gz fiv-a71069272599888742c70f832898094744ddb6dc.tar.xz fiv-a71069272599888742c70f832898094744ddb6dc.zip | |
Clean up namespace pollution
Diffstat (limited to 'tools/info.h')
| -rw-r--r-- | tools/info.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/info.h b/tools/info.h index 3106ecf..699e434 100644 --- a/tools/info.h +++ b/tools/info.h @@ -193,11 +193,11 @@ parse_exif_entry(jv o, const struct tiffer *T, struct tiffer_entry *entry, double real = 0; if (!entry->remaining_count) { v = jv_null(); - } else if (entry->type == IFD || subentries) { + } else if (entry->type == TIFFER_IFD || subentries) { v = parse_exif_subifds(T, entry, subentries); - } else if (entry->type == ASCII) { + } else if (entry->type == TIFFER_ASCII) { v = parse_exif_extract_sole_array_element(parse_exif_ascii(entry)); - } else if (entry->type == UNDEFINED && !info->values) { + } else if (entry->type == TIFFER_UNDEFINED && !info->values) { // Several Exif entries of UNDEFINED type contain single-byte numbers. v = parse_exif_undefined(entry); } else if (tiffer_real(T, entry, &real)) { @@ -682,7 +682,7 @@ parse_mpf_index_entry(jv o, uint32_t **offsets, const struct tiffer *T, struct tiffer_entry *entry) { // 5.2.3.3. MP Entry - if (entry->tag != MPF_MPEntry || entry->type != UNDEFINED || + if (entry->tag != MPF_MPEntry || entry->type != TIFFER_UNDEFINED || entry->remaining_count % 16) { return parse_exif_entry(o, T, entry, mpf_entries); } |