From 0a3c8067c145dc8b610dbcd58409d3ae5b7a2bc3 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Fri, 5 May 2017 22:20:58 +0200 Subject: [PATCH] libavcodec/exr : simplify reorder_pixels reorder_pixels is call by rle_uncompress and zip_uncompress with size == uncompress_size uncompress_size is a multiple of 2 (because exr store data in half, float, or uint32) --- libavcodec/exr.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index b37f91f..f114484 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -37,6 +37,7 @@ #include #include +#include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" #include "libavutil/intfloat.h" @@ -276,21 +277,17 @@ static void predictor(uint8_t *src, int size) static void reorder_pixels(uint8_t *src, uint8_t *dst, int size) { - const int8_t *t1 = src; - const int8_t *t2 = src + (size + 1) / 2; - int8_t *s = dst; - int8_t *stop = s + size; - - while (1) { - if (s < stop) - *(s++) = *(t1++); - else - break; + const uint8_t *t1 = src; + int half_size = size / 2; + const uint8_t *t2 = src + half_size; + uint8_t *s = dst; + int i; - if (s < stop) - *(s++) = *(t2++); - else - break; + av_assert1(size % 2 == 0); + + for (i = 0; i < half_size; i++) { + *(s++) = *(t1++); + *(s++) = *(t2++); } } -- 1.9.3 (Apple Git-50)