diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:05 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:05 +0100 |
| commit | e50b495c48648bf53621a4afc63682579387ba4f (patch) | |
| tree | 3a8d5cc53263def1a66e1dbc169d30da0a2af957 /demos/modules/gadc/gwinosc.c | |
| parent | 69fb0ea6ccbfb231e0fc98c2a324611cc803d691 (diff) | |
| parent | 6515373b2a63a24b77ff20a26e9b18468f29a6f9 (diff) | |
| download | uGFX-e50b495c48648bf53621a4afc63682579387ba4f.tar.gz uGFX-e50b495c48648bf53621a4afc63682579387ba4f.tar.bz2 uGFX-e50b495c48648bf53621a4afc63682579387ba4f.zip | |
Merge branch 'master' into gfile
Diffstat (limited to 'demos/modules/gadc/gwinosc.c')
| -rw-r--r-- | demos/modules/gadc/gwinosc.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |