diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-05-22 15:10:51 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-12-31 14:04:14 +0000 |
| commit | 43bbdc520dd054acdf46088fbbee5d4a3b638d24 (patch) | |
| tree | ce1ca856ba34a430814066f8527c49eef5f95045 /frontends/amiga/bitmap.c | |
| parent | b7551fec72372df4cb40384818da5419904e4c98 (diff) | |
| download | netsurf-43bbdc520dd054acdf46088fbbee5d4a3b638d24.tar.gz netsurf-43bbdc520dd054acdf46088fbbee5d4a3b638d24.tar.bz2 | |
Fix merge error
Diffstat (limited to 'frontends/amiga/bitmap.c')
| -rw-r--r-- | frontends/amiga/bitmap.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 06d1f1f90..8c0f0b336 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -129,7 +129,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 { @@ -230,6 +230,11 @@ void amiga_bitmap_destroy(void *bitmap) ami_memory_clear_free(bm->pixdata); } +<<<<<<< HEAD +======= + if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); + +>>>>>>> Fix merge error if(bm->url) nsurl_unref(bm->url); if(bm->title) free(bm->title); |