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 /demos | |
| 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 'demos')
| -rw-r--r-- | demos/3rdparty/doom/i_system.c | 4 | ||||
| -rw-r--r-- | demos/modules/gadc/gwinosc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/demos/3rdparty/doom/i_system.c b/demos/3rdparty/doom/i_system.c index 094144f6..aa1d7481 100644 --- a/demos/3rdparty/doom/i_system.c +++ b/demos/3rdparty/doom/i_system.c @@ -66,7 +66,7 @@ int I_GetHeapSize (void) byte* I_ZoneBase (int* size) { *size = mb_used*1024*1024; - return (byte *) gfxAlloc (*size); + return gfxAlloc (*size); } @@ -124,7 +124,7 @@ byte* I_Malloc(int length) { byte* mem; - mem = (byte *)gfxAlloc (length); + mem = gfxAlloc (length); memset (mem,0,length); return mem; } diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c index b7201088..4cc1fc3a 100644 --- a/demos/modules/gadc/gwinosc.c +++ b/demos/modules/gadc/gwinosc.c @@ -70,9 +70,9 @@ GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint return 0; gfxSemInit(&gs->bsem, 0, 1); gs->nextx = 0; - if (!(gs->lastscopetrace = (coord_t *)gfxAlloc(gs->g.width * sizeof(coord_t)))) + if (!(gs->lastscopetrace = gfxAlloc(gs->g.width * sizeof(coord_t)))) return 0; - if (!(gs->audiobuf = (adcsample_t *)gfxAlloc(AUDIOBUFSZ * sizeof(adcsample_t)))) + if (!(gs->audiobuf = gfxAlloc(AUDIOBUFSZ * sizeof(adcsample_t)))) return 0; #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP gs->lasty = gs->g.height/2; |