Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/e0e9fbf29427fbf065e2cd9f8f54a98efcec44a7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/e0e9fbf29427fbf065e2cd9f8f54a98efcec44a7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/e0e9fbf29427fbf065e2cd9f8f54a98efcec44a7
The branch, chris/extmem has been updated
via e0e9fbf29427fbf065e2cd9f8f54a98efcec44a7 (commit)
from d4cba8e4f7513f8757073347268c1dc8dffb33d4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=e0e9fbf29427fbf065e2cd9f8f54a98efcec44a7
commit e0e9fbf29427fbf065e2cd9f8f54a98efcec44a7
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Don't map an extmem area is it is already mapped, just extend the lifetime
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 5108fad..9df6569 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -156,9 +156,11 @@ unsigned char *amiga_bitmap_get_buffer(void *bitmap)
struct bitmap *bm = bitmap;
#ifdef __amigaos4__
- if((nsoption_bool(use_extmem) == true) && (bm->pixdata == NULL)) {
- LOG("Mapping ExtMem object %p for bitmap %p", bm->iextmem, bm);
- bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0);
+ if(nsoption_bool(use_extmem) == true) {
+ if(bm->pixdata == NULL) {
+ LOG("Mapping ExtMem object %p for bitmap %p",
bm->iextmem, bm);
+ bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0);
+ }
/* unmap the buffer after one second */
ami_schedule(1000, amiga_bitmap_unmap_buffer, bm);
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 5108fad..9df6569 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -156,9 +156,11 @@ unsigned char *amiga_bitmap_get_buffer(void *bitmap)
struct bitmap *bm = bitmap;
#ifdef __amigaos4__
- if((nsoption_bool(use_extmem) == true) && (bm->pixdata == NULL)) {
- LOG("Mapping ExtMem object %p for bitmap %p", bm->iextmem, bm);
- bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0);
+ if(nsoption_bool(use_extmem) == true) {
+ if(bm->pixdata == NULL) {
+ LOG("Mapping ExtMem object %p for bitmap %p",
bm->iextmem, bm);
+ bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0);
+ }
/* unmap the buffer after one second */
ami_schedule(1000, amiga_bitmap_unmap_buffer, bm);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
