netsurf: branch master updated. release/3.10-235-geb7037a

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/eb7037ac4fa71a3cfe86b... ...commit http://git.netsurf-browser.org/netsurf.git/commit/eb7037ac4fa71a3cfe86bcb... ...tree http://git.netsurf-browser.org/netsurf.git/tree/eb7037ac4fa71a3cfe86bcb7e... The branch, master has been updated via eb7037ac4fa71a3cfe86bcb7e32d750b4e7c14a7 (commit) from 44e464e98daed2e0eab9cf52446ad2ab4e9a65a6 (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=eb7037ac4fa71a3cfe8... commit eb7037ac4fa71a3cfe86bcb7e32d750b4e7c14a7 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Amiga: Do not use pre-multiplied alpha with CompositeTags() (ie. OS4 RTG) diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 6734433..8eb34fb 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -6670,12 +6670,6 @@ int main(int argc, char** argv) win_destroyed = false; ami_font_setdevicedpi(0); /* for early font requests, eg treeview init */ - bitmap_set_format(&(bitmap_fmt_t) { - .layout = BITMAP_LAYOUT_ARGB8888, - .pma = true, - }); - NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian)"); - window_list = NewObjList(); urldb_load(nsoption_charp(url_file)); diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c index fe1e58f..8bc1712 100644 --- a/frontends/amiga/plotters.c +++ b/frontends/amiga/plotters.c @@ -126,11 +126,34 @@ struct gui_globals *ami_plot_ra_alloc(ULONG width, ULONG height, bool force32bit if(depth < 16) { gg->palette_mapped = true; if(force32bit == false) palette_mapped = true; + + bitmap_set_format(&(bitmap_fmt_t) { + .layout = BITMAP_LAYOUT_ARGB8888, + .pma = true, + }); + + NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian) (PMA)"); + } else { gg->palette_mapped = false; - if(force32bit == false) palette_mapped = false; + + bitmap_set_format(&(bitmap_fmt_t) { + .layout = BITMAP_LAYOUT_ARGB8888, + .pma = false, + }); + + NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian)"); + } #else + bitmap_set_format(&(bitmap_fmt_t) { + .layout = BITMAP_LAYOUT_ARGB8888, + .pma = true, + }); + + NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian) (PMA)"); + + /* Friend BitMaps are weird. * For OS4, we shouldn't use a friend BitMap here (see below). * For OS3 AGA, we get no display blitted if we use a friend BitMap, @@ -149,7 +172,6 @@ struct gui_globals *ami_plot_ra_alloc(ULONG width, ULONG height, bool force32bit if(force32bit == false) palette_mapped = true; } else { gg->palette_mapped = false; - if(force32bit == false) palette_mapped = false; } #endif ----------------------------------------------------------------------- Summary of changes: frontends/amiga/gui.c | 6 ------ frontends/amiga/plotters.c | 26 ++++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 6734433..8eb34fb 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -6670,12 +6670,6 @@ int main(int argc, char** argv) win_destroyed = false; ami_font_setdevicedpi(0); /* for early font requests, eg treeview init */ - bitmap_set_format(&(bitmap_fmt_t) { - .layout = BITMAP_LAYOUT_ARGB8888, - .pma = true, - }); - NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian)"); - window_list = NewObjList(); urldb_load(nsoption_charp(url_file)); diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c index fe1e58f..8bc1712 100644 --- a/frontends/amiga/plotters.c +++ b/frontends/amiga/plotters.c @@ -126,11 +126,34 @@ struct gui_globals *ami_plot_ra_alloc(ULONG width, ULONG height, bool force32bit if(depth < 16) { gg->palette_mapped = true; if(force32bit == false) palette_mapped = true; + + bitmap_set_format(&(bitmap_fmt_t) { + .layout = BITMAP_LAYOUT_ARGB8888, + .pma = true, + }); + + NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian) (PMA)"); + } else { gg->palette_mapped = false; - if(force32bit == false) palette_mapped = false; + + bitmap_set_format(&(bitmap_fmt_t) { + .layout = BITMAP_LAYOUT_ARGB8888, + .pma = false, + }); + + NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian)"); + } #else + bitmap_set_format(&(bitmap_fmt_t) { + .layout = BITMAP_LAYOUT_ARGB8888, + .pma = true, + }); + + NSLOG(netsurf, INFO, "Set bitmap format to 0xAARRGGBB (native endian) (PMA)"); + + /* Friend BitMaps are weird. * For OS4, we shouldn't use a friend BitMap here (see below). * For OS3 AGA, we get no display blitted if we use a friend BitMap, @@ -149,7 +172,6 @@ struct gui_globals *ami_plot_ra_alloc(ULONG width, ULONG height, bool force32bit if(force32bit == false) palette_mapped = true; } else { gg->palette_mapped = false; - if(force32bit == false) palette_mapped = false; } #endif -- NetSurf Browser