summaryrefslogtreecommitdiffstats
path: root/nuttx/graphics
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2011-10-23 22:07:13 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2011-10-23 22:07:13 +0000
commit382f278302e6c6c81611647d5b78b41dfeed211f (patch)
tree0f89e5c004d1433ded321a51b2ff3c66a855f2f2 /nuttx/graphics
parent17cb15fa2e3e9bae5c83935619c2d4d3d65c8d04 (diff)
Oops.. back out most of the last change
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4060 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/graphics')
-rw-r--r--nuttx/graphics/nxbe/nxbe_bitmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/graphics/nxbe/nxbe_bitmap.c b/nuttx/graphics/nxbe/nxbe_bitmap.c
index 1c23445b19..dcbdb2ae9b 100644
--- a/nuttx/graphics/nxbe/nxbe_bitmap.c
+++ b/nuttx/graphics/nxbe/nxbe_bitmap.c
@@ -151,10 +151,10 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
}
/* Verify that the width of the destination rectangle does not exceed the
- * width of the source bitmap data
+ * width of the source bitmap data (taking into account the bitmap origin)
*/
- deststride = (((bounds.pt2.x - bounds.pt1.x + 1) * wnd->be->plane[0].pinfo.bpp + 7) >> 3);
+ deststride = (((bounds.pt2.x - origin->x + 1) * wnd->be->plane[0].pinfo.bpp + 7) >> 3);
if (deststride > stride)
{
gdbg("Bad dest width\n");