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/include | |
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/include')
-rw-r--r-- | NxWidgets/libnxwidgets/include/cbitmap.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cscaledbitmap.hxx | 209 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/ibitmap.hxx | 15 |
4 files changed, 219 insertions, 9 deletions
diff --git a/NxWidgets/libnxwidgets/include/cbitmap.hxx b/NxWidgets/libnxwidgets/include/cbitmap.hxx index 4828ca9cc..0fd133303 100644 --- a/NxWidgets/libnxwidgets/include/cbitmap.hxx +++ b/NxWidgets/libnxwidgets/include/cbitmap.hxx @@ -179,7 +179,7 @@ namespace NXWidgets * @return The bitmap's width. */ - const nxgl_coord_t getStride(void) const; + const size_t getStride(void) const; /** * Use the colors associated with a selected image. diff --git a/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx b/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx index dd869c476..1235c80fb 100644 --- a/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx +++ b/NxWidgets/libnxwidgets/include/crlepalettebitmap.hxx @@ -235,7 +235,7 @@ namespace NXWidgets * @return The bitmap's width. */ - const nxgl_coord_t getStride(void) const; + const size_t getStride(void) const; /** * Use the colors associated with a selected image. diff --git a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx new file mode 100644 index 000000000..4c5d8f729 --- /dev/null +++ b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx @@ -0,0 +1,209 @@ +/**************************************************************************** + * NxWidgets/libnxwidgets/include/cscaledbitmap.hxx + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <gnutt@nuttx.org> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX, NxWidgets, nor the names of its contributors + * me be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __INCLUDE_CSCALEDBITMAP_HXX +#define __INCLUDE_CSCALEDBITMAP_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> +#include <fixedmath.h> +#include <debug.h> + +#include <nuttx/rgbcolors.h> +#include <nuttx/nx/nxglib.h> + +#include "nxconfig.hxx" +#include "ibitmap.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + /** + * Class for scaling layer for any bitmap that inherits from IBitMap + */ + + class CScaledBitmap : public IBitmap + { + protected: + FAR IBitmap *m_bitmap; /**< The bitmap that is being scaled */ + struct nxgl_size_s m_size; /**< Scaled size of the image */ + FAR uint8_t *m_rowCache[2]; /**< Two cached rows of the image */ + unsigned int m_row; /**< Row number of the first cached row */ + b16_t m_xScale; /**< X scale factor */ + b16_t m_yScale; /**< Y scale factor */ + + /** + * Read two rows into the row cache + * + * @param row - The row number of the first row to cache + */ + + bool cacheRows(unsigned int row); + + /** + * Given an two RGB colors and a fractional value, return the scaled + * value between the two colors. + * + * @param incolor1 - The first color to be used + * @param incolor2 - The second color to be used + * @param fraction - The fractional value + * @param outcolor - The returned, scaled color + */ + + bool scaleColor(FAR const struct rgbcolor_s &incolor1, + FAR const struct rgbcolor_s &incolor2, + b16_t fraction, FAR struct rgbcolor_s &outcolor); + + /** + * Given an image row and a non-integer column offset, return the + * interpolated RGB color value corresponding to that position + * + * @param row - The pointer to the row in the row cache to use + * @param column - The non-integer column offset + * @param outcolor - The returned, interpolated color + * + */ + + bool rowColor(FAR uint8_t *row, b16_t column, + FAR struct rgbcolor_s &outcolor); + + /** + * Copy constructor is protected to prevent usage. + */ + + inline CScaledBitmap(const CScaledBitmap &bitmap) { } + + public: + + /** + * Constructor. + * + * @param bitmap The bitmap structure being scaled. + * @newSize The new, scaled size of the image + */ + + CScaledBitmap(IBitmap *bitmap, struct nxgl_size_s &newSize); + + /** + * Destructor. + */ + + ~CScaledBitmap(void); + + /** + * Get the bitmap's color format. + * + * @return The bitmap's color format. + */ + + const uint8_t getColorFormat(void) const; + + /** + * Get the bitmap's color format. + * + * @return The bitmap's pixel depth. + */ + + const uint8_t getBitsPerPixel(void) const; + + /** + * Get the bitmap's width (in pixels/columns). + * + * @return The bitmap's width (in pixels/columns). + */ + + const nxgl_coord_t getWidth(void) const; + + /** + * Get the bitmap's height (in rows). + * + * @return The bitmap's height (in rows). + */ + + inline const nxgl_coord_t getHeight(void) const; + + /** + * Get the bitmap's width (in bytes). + * + * @return The bitmap's width (in bytes). + */ + + const size_t getStride(void) const; + + /** + * Use the colors associated with a selected image. + * + * @param selected. true: Use colors for a selected widget, + * false: Use normal (default) colors. + */ + + inline void setSelected(bool selected) {} + + /** + * Get one row from the bit map image. + * + * @param x The offset into the row to get + * @param y The row number to get + * @param width The number of pixels to get from the row + * @param data The memory location provided by the caller + * in which to return the data. This should be at least + * (getWidth()*getBitsPerPixl() + 7)/8 bytes in length + * and properly aligned for the pixel color format. + * @param True if the run was returned successfully. + */ + + bool getRun(nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t width, + FAR void *data); + }; +} + +#endif // __cplusplus + +#endif // __INCLUDE_CSCALEDBITMAP_HXX diff --git a/NxWidgets/libnxwidgets/include/ibitmap.hxx b/NxWidgets/libnxwidgets/include/ibitmap.hxx index 923df407a..c4e235dc5 100644 --- a/NxWidgets/libnxwidgets/include/ibitmap.hxx +++ b/NxWidgets/libnxwidgets/include/ibitmap.hxx @@ -73,9 +73,10 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> +#include <sys/types.h> #include <stdint.h> #include <stdbool.h> @@ -84,11 +85,11 @@ /**************************************************************************** * Pre-Processor Definitions ****************************************************************************/ - + /**************************************************************************** * Implementation Classes ****************************************************************************/ - + #if defined(__cplusplus) namespace NXWidgets @@ -114,7 +115,7 @@ namespace NXWidgets /** * Get the bitmap's color format. * - * @return The bitmap's width. + * @return The bitmap's color format. */ virtual const uint8_t getColorFormat(void) const = 0; @@ -130,7 +131,7 @@ namespace NXWidgets /** * Get the bitmap's width (in pixels/columns). * - * @return The bitmap's pixel depth. + * @return The bitmap's width (in pixels/columns). */ virtual const nxgl_coord_t getWidth(void) const = 0; @@ -138,7 +139,7 @@ namespace NXWidgets /** * Get the bitmap's height (in rows). * - * @return The bitmap's height. + * @return The bitmap's height (in rows). */ virtual const nxgl_coord_t getHeight(void) const = 0; @@ -149,7 +150,7 @@ namespace NXWidgets * @return The bitmap's width. */ - virtual const nxgl_coord_t getStride(void) const = 0; + virtual const size_t getStride(void) const = 0; /** * Use the colors associated with a selected image. |