Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/4db40c3f27d0ade8fc76f57cd383e5ff52ad7c93
...commit
http://git.netsurf-browser.org/netsurf.git/commit/4db40c3f27d0ade8fc76f57cd383e5ff52ad7c93
...tree
http://git.netsurf-browser.org/netsurf.git/tree/4db40c3f27d0ade8fc76f57cd383e5ff52ad7c93
The branch, chris/extmem has been updated
via 4db40c3f27d0ade8fc76f57cd383e5ff52ad7c93 (commit)
from ce3b92b65fc9a6503ea9f3a01155a9ecd521bed0 (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=4db40c3f27d0ade8fc76f57cd383e5ff52ad7c93
commit 4db40c3f27d0ade8fc76f57cd383e5ff52ad7c93
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Disable ExtMem in palette-mapped modes
Something handling palette mapped images causes a freeze.
diff --git a/amiga/gui.c b/amiga/gui.c
index 9c89084..33f4435 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -510,6 +510,10 @@ static void ami_set_screen_defaults(struct Screen *screen)
nsoption_default_set_int(redraw_tile_size_x, screen->Width);
nsoption_default_set_int(redraw_tile_size_y, screen->Height);
+ if((screen != NULL) && (GetBitMapAttr(screen->RastPort.BitMap,
BMA_DEPTH) < 24)) {
+ nsoption_set_bool(use_extmem, false);
+ }
+
/* set system colours for amiga ui */
colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveBorder,
screen, 0x00000000);
colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveCaption,
screen, 0x00dddddd);
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/amiga/gui.c b/amiga/gui.c
index 9c89084..33f4435 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -510,6 +510,10 @@ static void ami_set_screen_defaults(struct Screen *screen)
nsoption_default_set_int(redraw_tile_size_x, screen->Width);
nsoption_default_set_int(redraw_tile_size_y, screen->Height);
+ if((screen != NULL) && (GetBitMapAttr(screen->RastPort.BitMap,
BMA_DEPTH) < 24)) {
+ nsoption_set_bool(use_extmem, false);
+ }
+
/* set system colours for amiga ui */
colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveBorder,
screen, 0x00000000);
colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveCaption,
screen, 0x00dddddd);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
