aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-07-04 01:08:47 +1000
committerinmarket <andrewh@inmarket.com.au>2013-07-04 01:08:47 +1000
commitc059f96d24c814fc34d470aa01577f294f9d73a6 (patch)
tree8d8587fc99906b698731089deca1439f8a62d09e
parentf9eed6036d7f28ef1ab8f8d3feec6a05e0572405 (diff)
downloaduGFX-c059f96d24c814fc34d470aa01577f294f9d73a6.tar.gz
uGFX-c059f96d24c814fc34d470aa01577f294f9d73a6.tar.bz2
uGFX-c059f96d24c814fc34d470aa01577f294f9d73a6.zip
Rename gwin base image function to avoid confusion with the image gwin object.
-rw-r--r--include/gwin/gwin.h2
-rw-r--r--src/gwin/gwin.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h
index dd8abb0f..4d0deaf0 100644
--- a/include/gwin/gwin.h
+++ b/include/gwin/gwin.h
@@ -769,7 +769,7 @@ extern "C" {
*
* @api
*/
- gdispImageError gwinImageDraw(GHandle gh, gdispImage *img, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy);
+ gdispImageError gwinDrawImage(GHandle gh, gdispImage *img, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy);
#endif
#ifdef __cplusplus
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c
index 9e345523..92b6cc03 100644
--- a/src/gwin/gwin.c
+++ b/src/gwin/gwin.c
@@ -530,7 +530,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor
#endif
#if GDISP_NEED_IMAGE
- gdispImageError gwinImageDraw(GHandle gh, gdispImage *img, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy) {
+ gdispImageError gwinDrawImage(GHandle gh, gdispImage *img, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy) {
if (!((gh->flags & GWIN_FLG_VISIBLE)))
return GDISP_IMAGE_ERR_OK;