diff options
author | Tectu <joel@unormal.org> | 2012-08-06 15:06:56 -0700 |
---|---|---|
committer | Tectu <joel@unormal.org> | 2012-08-06 15:06:56 -0700 |
commit | f21d4c9c9a7c044c08e89acfa77a1ce4a2a68771 (patch) | |
tree | fcd7d3f4186c81a7a0902eabf035c1b92bc01dd7 /halext | |
parent | e2629e350b9db524ce328b18535cfa005edec0f4 (diff) | |
parent | 9f33efcf21c6dc63187d7d77ff94e438a2733777 (diff) | |
download | uGFX-f21d4c9c9a7c044c08e89acfa77a1ce4a2a68771.tar.gz uGFX-f21d4c9c9a7c044c08e89acfa77a1ce4a2a68771.tar.bz2 uGFX-f21d4c9c9a7c044c08e89acfa77a1ce4a2a68771.zip |
Merge pull request #33 from inmarket/master
Compile error fix for GDISP_NEED_MULTITHREAD
Diffstat (limited to 'halext')
-rw-r--r-- | halext/include/gdisp.h | 2 | ||||
-rw-r--r-- | halext/src/gdisp.c | 21 |
2 files changed, 2 insertions, 21 deletions
diff --git a/halext/include/gdisp.h b/halext/include/gdisp.h index d284c125..454f5c4c 100644 --- a/halext/include/gdisp.h +++ b/halext/include/gdisp.h @@ -200,7 +200,7 @@ extern "C" { void gdispDrawPixel(coord_t x, coord_t y, color_t color);
void gdispDrawLine(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color);
void gdispFillArea(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
- void gdispBlitArea(coord_t x, coord_t y, coord_t cx, coord_t cy, const pixel_t *buffer);
+ void gdispBlitArea(coord_t x, coord_t y, coord_t cx, coord_t cy, pixel_t *buffer);
/* Circle Functions */
#if GDISP_NEED_CIRCLE
diff --git a/halext/src/gdisp.c b/halext/src/gdisp.c index 4bbff695..de3761cd 100644 --- a/halext/src/gdisp.c +++ b/halext/src/gdisp.c @@ -92,24 +92,6 @@ #if GDISP_NEED_MULTITHREAD || defined(__DOXYGEN__)
/**
- * @brief Set the orientation of the display.
- * @pre The GDISP unit must be in powerOn or powerSleep mode.
- * @note Depending on the hardware implementation this function may clear
- * the display when changing its orientation.
- *
- * @param[in] newOrientation The new orientation to use
- *
- * @api
- */
- void gdispSetOrientation(gdisp_orientation_t newOrientation) {
- MUTEX_ENTER
- gdisp_lld_setorientation(newOrientation);
- MUTEX_EXIT
- }
-#endif
-
-#if GDISP_NEED_MULTITHREAD || defined(__DOXYGEN__)
- /**
* @brief Clear the display to the specified color.
* @pre The GDISP unit must be in powerOn or powerSleep mode.
*
@@ -688,13 +670,12 @@ */
coord_t gdispGetStringWidth(const char* str, font_t font) {
/* No mutex required as we only read static data */
- coord_t w, h, p, x;
+ coord_t w, p, x;
char c;
int first;
first = 1;
x = 0;
- h = font->height * font->yscale;
p = font->charPadding * font->xscale;
while(*str) {
/* Get the next printable character */
|