p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jpeginfo: parse all numeric TIFF values

This commit is contained in:
Přemysl Eric Janouch 2021-12-04 06:51:44 +01:00
parent 4d9236336c
commit 5d659d208c
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tools/jpeginfo.c
View File

@ -594,10 +594,6 @@ parse_exif_ascii(struct tiffer_entry *entry)
a = jv_array_append(a, a = jv_array_append(a,
jv_string_sized((const char *) entry->p, entry->remaining_count)); jv_string_sized((const char *) entry->p, entry->remaining_count));
} }
// TODO(p): May extract this into a function, and reuse it below.
if (jv_array_length(jv_copy(a)) == 1)
return jv_array_get(a, 0);
return a; return a;
} }
@ -615,38 +611,50 @@ parse_exif_undefined(struct tiffer_entry *entry)
return s; return s;
} }
static jv
parse_exif_value(const struct tiff_value *values, double real)
{
if (values) {
for (; values->name; values++)
if (values->value == real)
return jv_string(values->name);
}
return jv_number(real);
}
static jv
parse_exif_extract_sole_array_element(jv a)
{
return jv_array_length(jv_copy(a)) == 1 ? jv_array_get(a, 0) : a;
}
static jv static jv
parse_exif_entry(jv o, struct tiffer *T, struct tiffer_entry *entry) parse_exif_entry(jv o, struct tiffer *T, struct tiffer_entry *entry)
{ {
jv value = jv_true(); const struct tiff_entry *info = tiff_entries;
bool numeric = false; for (; info->name; info++)
if (info->tag == entry->tag)
break;
jv v = jv_true();
double real = 0; double real = 0;
if (!entry->remaining_count) { if (!entry->remaining_count) {
value = jv_null(); v = jv_null();
} else if (entry->type == IFD) { } else if (entry->type == IFD) {
value = parse_exif_subifds(T, entry); v = parse_exif_subifds(T, entry);
} else if (entry->type == ASCII) { } else if (entry->type == ASCII) {
value = parse_exif_ascii(entry); v = parse_exif_extract_sole_array_element(parse_exif_ascii(entry));
} else if (entry->type == UNDEFINED) { } else if (entry->type == UNDEFINED) {
value = parse_exif_undefined(entry); v = parse_exif_undefined(entry);
} else if ((numeric = tiffer_real(T, entry, &real))) { } else if (tiffer_real(T, entry, &real)) {
value = jv_number(real); v = jv_array();
do v = jv_array_append(v, parse_exif_value(info->values, real));
while (tiffer_next_value(entry) && tiffer_real(T, entry, &real));
v = parse_exif_extract_sole_array_element(v);
} }
// TODO(p): Iterate over all numeric values. if (info->name)
for (const struct tiff_entry *p = tiff_entries; p->name; p++) { return jv_set(o, jv_string(info->name), v);
if (p->tag != entry->tag) return jv_set(o, jv_string_fmt("%u", entry->tag), v);
continue;
if (numeric && p->values) {
for (const struct tiff_value *q = p->values; q->name; q++) {
if (q->value == real)
return jv_set(o, jv_string(p->name), jv_string(q->name));
}
}
return jv_set(o, jv_string(p->name), value);
}
return jv_set(o, jv_string_fmt("%u", entry->tag), value);
} }
static jv static jv