diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-30 01:21:26 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-30 01:21:26 +0000 |
commit | 284cd6923b521898c0927992fab77593ad797b4a (patch) | |
tree | ecdc27cff477efee7da31d0fae65b527377e094f /NxWidgets/nxwm/src/glyph_start.cxx | |
parent | 45f021f2a88d9f76c7802aa31d3fc67827ff288d (diff) | |
download | nuttx-284cd6923b521898c0927992fab77593ad797b4a.tar.gz nuttx-284cd6923b521898c0927992fab77593ad797b4a.tar.bz2 nuttx-284cd6923b521898c0927992fab77593ad797b4a.zip |
NxWM update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4677 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/src/glyph_start.cxx')
-rwxr-xr-x | NxWidgets/nxwm/src/glyph_start.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx index 95a22e611..a81d6b19f 100755 --- a/NxWidgets/nxwm/src/glyph_start.cxx +++ b/NxWidgets/nxwm/src/glyph_start.cxx @@ -49,7 +49,8 @@ #include "nxconfig.hxx" #include "crlepalettebitmap.hxx" -#include "glyphs.hxx" + +#include "nxwmglyphs.hxx" /******************************************************************************************** * Pre-Processor Definitions @@ -125,7 +126,7 @@ static const nxgl_mxpixel_t g_startLut[BITMAP_NLUTCODES] = # error "Unsupport pixel format" #endif -static const struct SRlePaletteBitmapEntry g_startRleEntries[] = +static const struct NXWidgets::SRlePaletteBitmapEntry g_startRleEntries[] = { { 7, 0}, { 1, 1}, { 3, 2}, { 1, 3}, { 4, 2}, { 1, 4}, { 1, 5}, { 7, 0}, /* Row 0 */ { 5, 0}, { 1, 6}, { 2, 7}, { 1, 8}, { 1, 9}, { 2, 1}, { 1, 10}, { 2, 9}, /* Row 1 */ @@ -196,7 +197,7 @@ static const struct SRlePaletteBitmapEntry g_startRleEntries[] = * Public Bitmap Structure Defintions ********************************************************************************************/ -const struct SRlePaletteBitmap NXWidgets::g_startBitmap = +const struct NXWidgets::SRlePaletteBitmap g_startBitmap = { CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel CONFIG_NXWIDGETS_FMT, // fmt - Color format |