From b9aa66266d4afd4ff8fe978bca4d706a809a4c1c Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 16 May 2010 18:02:37 +0000 Subject: Fixes for rendering fonts at 4bpp git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2682 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/graphics/nxfonts/nxfonts_convert.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'nuttx/graphics') diff --git a/nuttx/graphics/nxfonts/nxfonts_convert.c b/nuttx/graphics/nxfonts/nxfonts_convert.c index ea8672c26..0f8788b8f 100644 --- a/nuttx/graphics/nxfonts/nxfonts_convert.c +++ b/nuttx/graphics/nxfonts/nxfonts_convert.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxfonts/nxfonts_convert.c * - * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -96,6 +96,14 @@ #endif +#if NXFONTS_BITSPERPIXEL < 8 +# ifdef CONFIG_NX_PACKEDMSFIRST +# define NXF_INITMASK (NXF_PIXELMASK << (8 - NXFONTS_BITSPERPIXEL)) +# else +# define NXF_INITMASK NXF_PIXELMASK +# endif +#endif + /* Form a function name by concatenating two strings */ #define _NXF_FUNCNAME(a,b) a ## b @@ -182,11 +190,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) col = 0; dptr = (FAR NXF_PIXEL_T*)line; pixel = *dptr; -#ifdef CONFIG_NX_PACKEDMSFIRST - mask = NXF_PIXELMASK << (8 - NXFONTS_BITSPERPIXEL); -#else - mask = NXF_PIXELMASK; -#endif + mask = NXF_INITMASK; nbits = 0; for (bmndx = 0; bmndx < bm->metric.stride && col < width; bmndx++) @@ -216,7 +220,7 @@ int NXF_FUNCNAME(nxf_convert,NXFONTS_SUFFIX) { *dptr++ = pixel; pixel = *dptr; - mask = NXF_PIXELMASK; + mask = NXF_INITMASK; nbits = 0; } } -- cgit v1.2.3