From d8de45a6c9fa646211579fad64962cd4e3742ea9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 17 Apr 2014 21:00:42 +0200 Subject: [PATCH] (SoftFilter) cleanup scale2x.c --- gfx/filters/scale2x.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gfx/filters/scale2x.c b/gfx/filters/scale2x.c index 91b8c8a31d..309a6bac0d 100644 --- a/gfx/filters/scale2x.c +++ b/gfx/filters/scale2x.c @@ -24,11 +24,7 @@ #define SCALE2X_SCALE 2 -#define SCALE2X_GENERIC(typename_t, width, height, first, last, src, src_stride, dst, dst_stride) \ - unsigned x, y; \ - typename_t *out0 = (typename_t*)dst; \ - typename_t *out1 = (typename_t*)(dst + dst_stride); \ - \ +#define SCALE2X_GENERIC(typename_t, width, height, first, last, src, src_stride, dst, dst_stride, out0, out1) \ for (y = 0; y < height; ++y) \ { \ const int prevline = ((y == 0) && first) ? 0 : src_stride; \ @@ -68,7 +64,11 @@ static void scale2x_generic_rgb565(unsigned width, unsigned height, const uint16_t *src, unsigned src_stride, uint16_t *dst, unsigned dst_stride) { - SCALE2X_GENERIC(uint16_t, width, height, first, last, src, src_stride, dst, dst_stride); + unsigned x, y; + uint16_t *out0, *out1; + out0 = (uint16_t*)dst; + out1 = (uint16_t*)(dst + dst_stride); + SCALE2X_GENERIC(uint16_t, width, height, first, last, src, src_stride, dst, dst_stride, out0, out1); } static void scale2x_generic_xrgb8888(unsigned width, unsigned height, @@ -76,7 +76,11 @@ static void scale2x_generic_xrgb8888(unsigned width, unsigned height, const uint32_t *src, unsigned src_stride, uint32_t *dst, unsigned dst_stride) { - SCALE2X_GENERIC(uint32_t, width, height, first, last, src, src_stride, dst, dst_stride); + unsigned x, y; + uint32_t *out0, *out1; + out0 = (uint32_t*)dst; + out1 = (uint32_t*)(dst + dst_stride); + SCALE2X_GENERIC(uint32_t, width, height, first, last, src, src_stride, dst, dst_stride, out0, out1); } static unsigned scale2x_generic_input_fmts(void)