Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for rendering fonts at 4bpp

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2682 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2010-05-16 18:02:37 +00:00
parent 83f135da9f
commit 36e5da2751
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxfonts/nxfonts_convert.c
+11 -7
View File
@@ -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 <spudmonkey@racsa.co.cr>
*
* 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;
}
}