summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-12-31 14:17:22 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2016-12-31 14:17:22 +0000
commit36b26b861f375de5b2be3ff9de37288049f05a26 (patch)
treeb8ea7d3ebdedda66fb50c44ace897353d9e351b5
parent43bbdc520dd054acdf46088fbbee5d4a3b638d24 (diff)
downloadnetsurf-36b26b861f375de5b2be3ff9de37288049f05a26.tar.gz
netsurf-36b26b861f375de5b2be3ff9de37288049f05a26.tar.bz2
Update to test ExtMem on OS4.1FEU1
Mostly works, but falls over when there are lots of tiny GIF anims on screen
-rw-r--r--frontends/amiga/bitmap.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 8c0f0b336..fe84a94b7 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -230,11 +230,6 @@ 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);