From e179291190e5b95afa9fbc10a04029bdd222ba86 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 17 Feb 2006 17:21:42 +0000 Subject: Use macro instead of literal constant for readability. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8716 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/jpeg.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 28c7aebbe8..7d29f353fe 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -1785,6 +1785,8 @@ int root_size; #define BUFAC 14118 /* 31 * 257 * 1.772 */ #endif +#define ROUNDOFFS (127*257) + /* Draw a partial YUV colour bitmap */ void yuv_bitmap_part(unsigned char *src[3], int csub_x, int csub_y, int src_x, int src_y, int stride, @@ -1839,9 +1841,9 @@ void yuv_bitmap_part(unsigned char *src[3], int csub_x, int csub_y, u = *usrc++ - 128; v = *vsrc++ - 128; - rc = RVFAC * v + 32639; - gc = GVFAC * v + GUFAC * u + 32639; - bc = BUFAC * u + 32639; + rc = RVFAC * v + ROUNDOFFS; + gc = GVFAC * v + GUFAC * u + ROUNDOFFS; + bc = BUFAC * u + ROUNDOFFS; do { @@ -1850,26 +1852,26 @@ void yuv_bitmap_part(unsigned char *src[3], int csub_x, int csub_y, green = GYFAC * y + gc; blue = BYFAC * y + bc; - if ((unsigned)red > (RYFAC*255+32639)) + if ((unsigned)red > (RYFAC*255+ROUNDOFFS)) { if (red < 0) red = 0; else - red = (RYFAC*255+32639); + red = (RYFAC*255+ROUNDOFFS); } - if ((unsigned)green > (GYFAC*255+32639)) + if ((unsigned)green > (GYFAC*255+ROUNDOFFS)) { if (green < 0) green = 0; else - green = (GYFAC*255+32639); + green = (GYFAC*255+ROUNDOFFS); } - if ((unsigned)blue > (BYFAC*255+32639)) + if ((unsigned)blue > (BYFAC*255+ROUNDOFFS)) { if (blue < 0) blue = 0; else - blue = (BYFAC*255+32639); + blue = (BYFAC*255+ROUNDOFFS); } rbits = ((unsigned)red) >> 16 ; gbits = ((unsigned)green) >> 16 ; @@ -1884,9 +1886,9 @@ void yuv_bitmap_part(unsigned char *src[3], int csub_x, int csub_y, { u = *usrc++ - 128; v = *vsrc++ - 128; - rc = RVFAC * v + 32639; - gc = GVFAC * v + GUFAC * u + 32639; - bc = BUFAC * u + 32639; + rc = RVFAC * v + ROUNDOFFS; + gc = GVFAC * v + GUFAC * u + ROUNDOFFS; + bc = BUFAC * u + ROUNDOFFS; xphase = 0; } } @@ -1897,8 +1899,8 @@ void yuv_bitmap_part(unsigned char *src[3], int csub_x, int csub_y, do { y = *ysrc++; - red = RYFAC * y + 32639; /* blue == red */ - green = GYFAC * y + 32639; + red = RYFAC * y + ROUNDOFFS; /* blue == red */ + green = GYFAC * y + ROUNDOFFS; rbits = ((unsigned)red) >> 16; gbits = ((unsigned)green) >> 16; #if LCD_PIXELFORMAT == RGB565 -- cgit v1.2.3