From: Nick Renieris <velocit...@gmail.com>
When the height is equal to the tile length (full-height tile)
after `height % tile_length` is applied with the current code,
it results in the operating tile_length to be 0. This commit
makes this leftover logic only applies if it's necessary.
Signed-off-by: Nick Renieris <velocit...@gmail.com>
---
libavcodec/tiff.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 78b4bd5301..3bf2b3e557 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -887,10 +887,14 @@ static int dng_decode_tiles(AVCodecContext *avctx,
AVFrame *frame)
int tile_byte_count_offset, tile_byte_count;
int tile_count_x, tile_count_y;
int tile_width, tile_length;
+ int has_width_leftover, has_height_leftover;
int tile_x = 0, tile_y = 0;
int pos_x = 0, pos_y = 0;
int ret;
+ has_width_leftover = (s->width % s->tile_width != 0);
+ has_height_leftover = (s->height % s->tile_length != 0);
+
/* Calculate tile counts (round up) */
tile_count_x = (s->width + s->tile_width - 1) / s->tile_width;
tile_count_y = (s->height + s->tile_length - 1) / s->tile_length;
@@ -900,12 +904,12 @@ static int dng_decode_tiles(AVCodecContext *avctx,
AVFrame *frame)
tile_x = tile_idx % tile_count_x;
tile_y = tile_idx / tile_count_x;
- if (tile_x == tile_count_x - 1) // If on the right edge
+ if (has_width_leftover && tile_x == tile_count_x - 1) // If on the
right-most tile
tile_width = s->width % s->tile_width;
else
tile_width = s->tile_width;
- if (tile_y == tile_count_y - 1) // If on the bottom edge
+ if (has_height_leftover && tile_y == tile_count_y - 1) // If on the
bottom-most tile
tile_length = s->height % s->tile_length;
else
tile_length = s->tile_length;
--
2.21.0.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
