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

jpeginfo: clean up

Browse Source 
No more -Wunused-function warnings.
This commit is contained in:
Přemysl Eric Janouch 2021-12-04 10:31:19 +01:00
parent 7cb2879c03
commit bac9cd24fc
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/jpeginfo.c
View File

@ -258,11 +258,11 @@ tiffer_rational(const struct tiffer *self, const struct tiffer_entry *entry,
*denominator = (int32_t) self->un->u32(entry->p + 4);
return true;
default:
if (!tiffer_integer(self, entry, numerator))
return false;
*denominator = 1;
return true;
if (tiffer_integer(self, entry, numerator)) {
*denominator = 1;
return true;
}
return false;
}
}
@ -275,14 +275,7 @@ tiffer_real(
// Somewhat excessively lenient, intended for display.
switch (entry->type) {
int64_t integer;
case RATIONAL:
*out = self->un->u32(entry->p) / (double) self->un->u32(entry->p + 4);
return true;
case SRATIONAL:
*out = (int32_t) self->un->u32(entry->p) /
(double) (int32_t) self->un->u32(entry->p + 4);
return true;
int64_t numerator, denominator;
case FLOAT:
*out = *(float *) entry->p;
return true;
@ -290,11 +283,11 @@ tiffer_real(
*out = *(double *) entry->p;
return true;
default:
if (!tiffer_integer(self, entry, &integer))
return false;
*out = integer;
return true;
if (tiffer_rational(self, entry, &numerator, &denominator)) {
*out = (double) numerator / denominator;
return true;
}
return false;
}
}