diff options
author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
commit | e178b08549bd0bf3e2a8d235518a60ea05681962 (patch) | |
tree | 58091e888e7712a659f21e04258c6a49eca22442 /src/gwin | |
parent | 3c99e6e67dfa9833e25ebd417ccbd45a2d4493f6 (diff) | |
parent | 6515373b2a63a24b77ff20a26e9b18468f29a6f9 (diff) | |
download | uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.gz uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.bz2 uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.zip |
Merge branch 'master' into gwin
Diffstat (limited to 'src/gwin')
-rw-r--r-- | src/gwin/console.c | 2 | ||||
-rw-r--r-- | src/gwin/gwidget.c | 2 | ||||
-rw-r--r-- | src/gwin/gwin.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gwin/console.c b/src/gwin/console.c index ef374220..623404be 100644 --- a/src/gwin/console.c +++ b/src/gwin/console.c @@ -285,7 +285,7 @@ GHandle gwinGConsoleCreate(GDisplay *g, GConsoleObject *gc, const GWindowInit *p gcw->bufsize *= gh->height / gdispGetFontMetric(gh->font, fontHeight); // Allocate the buffer - if (!(gcw->buffer = (char*)gfxAlloc(gcw->bufsize))) + if (!(gcw->buffer = gfxAlloc(gcw->bufsize))) return FALSE; // All good! diff --git a/src/gwin/gwidget.c b/src/gwin/gwidget.c index db9dc9fa..484b8c37 100644 --- a/src/gwin/gwidget.c +++ b/src/gwin/gwidget.c @@ -338,7 +338,7 @@ void gwinSetText(GHandle gh, const char *text, bool_t useAlloc) { else if (useAlloc) { char *str; - if ((str = (char *)gfxAlloc(strlen(text)+1))) { + if ((str = gfxAlloc(strlen(text)+1))) { gh->flags |= GWIN_FLG_ALLOCTXT; strcpy(str, text); } diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 9e0df7f8..a9d9d823 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -102,7 +102,7 @@ void _gwinInit(void) { GHandle _gwindowCreate(GDisplay *g, GWindowObject *pgw, const GWindowInit *pInit, const gwinVMT *vmt, uint16_t flags) { // Allocate the structure if necessary if (!pgw) { - if (!(pgw = (GWindowObject *)gfxAlloc(vmt->size))) + if (!(pgw = gfxAlloc(vmt->size))) return 0; pgw->flags = flags|GWIN_FLG_DYNAMIC; } else |