From 4f57070e272f506731557b35b484429a968c7dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Fri, 23 Jun 2023 13:34:59 +0200 Subject: Fix 32-bit build warnings --- tiffer.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tiffer.h') diff --git a/tiffer.h b/tiffer.h index b4e582e..870ad26 100644 --- a/tiffer.h +++ b/tiffer.h @@ -156,12 +156,18 @@ tiffer_next_ifd(struct tiffer *self) return tiffer_u16(self, &self->remaining_fields); } +static size_t +tiffer_length(const struct tiffer *self) +{ + return self->begin > self->end ? 0 : self->end - self->begin; +} + /// Initialize a derived TIFF reader for a subIFD at the given location. static bool tiffer_subifd( const struct tiffer *self, uint32_t offset, struct tiffer *subreader) { - if (self->begin > self->end || self->end - self->begin < offset) + if (tiffer_length(self) < offset) return false; *subreader = *self; @@ -332,7 +338,7 @@ tiffer_next_entry(struct tiffer *self, struct tiffer_entry *entry) if (values_size <= sizeof offset) { entry->p = self->p; self->p += sizeof offset; - } else if (tiffer_u32(self, &offset) && self->end - self->begin >= offset) { + } else if (tiffer_u32(self, &offset) && tiffer_length(self) >= offset) { entry->p = self->begin + offset; } else { return false; -- cgit v1.2.3