diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-05-22 15:10:51 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-05-22 15:10:51 +0100 |
commit | 53a5c4f6b679885948984b0a99f5195be3dd4345 (patch) | |
tree | 541601690d6ca3318d58be44aadd0d6ee4aefc18 | |
parent | fe5263c8f70ae399e270f0e2a6453024f24cee99 (diff) | |
download | netsurf-chris/extmem.tar.gz |
Fix merge errorchris/extmem
-rw-r--r-- | frontends/amiga/bitmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 586ea27d1..5fb8bdea9 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -109,7 +109,7 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) bitmap->pixdata = NULL; UBYTE *pixdata = amiga_bitmap_get_buffer(bitmap); - memset(bitmap->pixdata, 0xff, bitmap->size); + memset(pixdata, 0xff, bitmap->size); } else #endif { @@ -210,7 +210,6 @@ void amiga_bitmap_destroy(void *bitmap) } if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); - if(bm->psm) DeletePenShareMap(bm->psm); if(bm->url) nsurl_unref(bm->url); if(bm->title) free(bm->title); |