sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix an error in a bounding box calculation

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3763 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-07-09 21:11:00 +00:00
parent 9696a6d1aa
commit b3f79deadc
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/nxtext/nxtext_main.c
View File

@ -81,7 +81,7 @@
# define CONFIG_EXAMPLES_NXTEXT_DEVNO 0 # define CONFIG_EXAMPLES_NXTEXT_DEVNO 0
#endif #endif
#define BGMSG_LINES 4 #define BGMSG_LINES 24
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
@ -99,10 +99,30 @@
static const uint8_t g_pumsg[] = "Pop-Up!"; static const uint8_t g_pumsg[] = "Pop-Up!";
static const char *g_bgmsg[BGMSG_LINES] = static const char *g_bgmsg[BGMSG_LINES] =
{ {
"Now is the time ", "\nJULIET\n",
"for all good men ", "Wilt thou be gone? ",
"To come to the aid ", "It is not yet near day:\n",
"of their party. " "It was the nightingale, ",
"and not the lark,\n",
"That pierced the fearful hollow ",
"of thine ear;\n",
"Nightly she sings ",
"on yon pomegranate-tree:\n",
"Believe me, love, "
"it was the nightingale.\n"
"\nROMEO\n"
"It was the lark, "
"the herald of the morn,\n"
"No nightingale: "
"look, love, what envious streaks\n"
"Do lace the severing clouds "
"in yonder east:\n"
"Night's candles are burnt out, "
"and jocund day\n"
"Stands tiptoe "
"on the misty mountain tops.\n"
"I must be gone and live, "
"or stay and die. \n"
}; };
#endif #endif

5
examples/nxtext/nxtext_putc.c
View File

@ -522,8 +522,8 @@ void nxtext_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
bounds.pt1.x = bm->pos.x; bounds.pt1.x = bm->pos.x;
bounds.pt1.y = bm->pos.y; bounds.pt1.y = bm->pos.y;
bounds.pt1.x = bm->pos.x + glyph->width - 1; bounds.pt2.x = bm->pos.x + glyph->width - 1;
bounds.pt1.y = bm->pos.y + glyph->height - 1; bounds.pt2.y = bm->pos.y + glyph->height - 1;
/* Should this also be clipped to a region in the window? */ /* Should this also be clipped to a region in the window? */
@ -545,6 +545,7 @@ void nxtext_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
if (!nxgl_nullrect(&intersection)) if (!nxgl_nullrect(&intersection))
{ {
FAR const void *src = (FAR const void *)glyph->bitmap; FAR const void *src = (FAR const void *)glyph->bitmap;
ret = nx_bitmap((NXWINDOW)hwnd, &intersection, &src, ret = nx_bitmap((NXWINDOW)hwnd, &intersection, &src,
&bm->pos, (unsigned int)glyph->stride); &bm->pos, (unsigned int)glyph->stride);
if (ret < 0) if (ret < 0)