diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-15 11:09:20 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-15 11:09:20 -0600 |
| commit | 24ee5014675d43c80c0580882fe5cc24ca17e7a8 (patch) | |
| tree | e723687b37dcce6d8d582830c8ca0d52d057e9c6 /NxWidgets/libnxwidgets/src/cbitmap.cxx | |
| parent | b5a37a3e45ac9faea285cc252e742c1c7267a6d7 (diff) | |
| download | nuttx-24ee5014675d43c80c0580882fe5cc24ca17e7a8.tar.gz nuttx-24ee5014675d43c80c0580882fe5cc24ca17e7a8.tar.bz2 nuttx-24ee5014675d43c80c0580882fe5cc24ca17e7a8.zip | |
NxWidgets::CScaledImage: New class that wraps any class that provides IBitMap and adds image scaling
Diffstat (limited to 'NxWidgets/libnxwidgets/src/cbitmap.cxx')
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cbitmap.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NxWidgets/libnxwidgets/src/cbitmap.cxx b/NxWidgets/libnxwidgets/src/cbitmap.cxx index c9c974814..c0cf71ea4 100644 --- a/NxWidgets/libnxwidgets/src/cbitmap.cxx +++ b/NxWidgets/libnxwidgets/src/cbitmap.cxx @@ -149,7 +149,7 @@ const nxgl_coord_t CBitmap::getHeight(void) const * @return The bitmap's width. */ -const nxgl_coord_t CBitmap::getStride(void) const +const size_t CBitmap::getStride(void) const { return m_bitmap->stride; } @@ -172,7 +172,7 @@ bool CBitmap::getRun(nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t width, { // Check ranges. Casts to unsigned int are ugly but permit one-sided comparisons - if (((unsigned int)x < (unsigned int)width) && + if (((unsigned int)x < (unsigned int)m_bitmap->width) && ((unsigned int)(x + width) <= (unsigned int)m_bitmap->width) && ((unsigned int)y < (unsigned int)m_bitmap->height)) { |