netsurf: branch master updated. release/3.5-204-gd39f980

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Fri Jul 8 23:44:21 BST 2016


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/d39f98065a7c52c63e3c037a0a64f94186c3ce00
...commit http://git.netsurf-browser.org/netsurf.git/commit/d39f98065a7c52c63e3c037a0a64f94186c3ce00
...tree http://git.netsurf-browser.org/netsurf.git/tree/d39f98065a7c52c63e3c037a0a64f94186c3ce00

The branch, master has been updated
       via  d39f98065a7c52c63e3c037a0a64f94186c3ce00 (commit)
      from  ddcc914a3ffe02edaeafa93eecf54a77daf8a4cd (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=d39f98065a7c52c63e3c037a0a64f94186c3ce00
commit d39f98065a7c52c63e3c037a0a64f94186c3ce00
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Fix the caching logic now we've moved 8-bit scaling earlier in the code

diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 53e33d6..a7271f8 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -463,8 +463,10 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap,
 			}
 		}
 
-		if(nsoption_int(cache_bitmaps) == 2)
-		{
+		if(((type == AMI_NSBM_TRUECOLOUR) && (nsoption_int(cache_bitmaps) == 2)) ||
+				((type == AMI_NSBM_PALETTEMAPPED) && (((bitmap->width == width) &&
+				(bitmap->height == height) && (nsoption_int(cache_bitmaps) == 2)) ||
+				(nsoption_int(cache_bitmaps) >= 1)))) {
 			bitmap->nativebm = tbm;
 			if(type == AMI_NSBM_TRUECOLOUR) {
 				bitmap->nativebmwidth = bitmap->width;


-----------------------------------------------------------------------

Summary of changes:
 frontends/amiga/bitmap.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 53e33d6..a7271f8 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -463,8 +463,10 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap,
 			}
 		}
 
-		if(nsoption_int(cache_bitmaps) == 2)
-		{
+		if(((type == AMI_NSBM_TRUECOLOUR) && (nsoption_int(cache_bitmaps) == 2)) ||
+				((type == AMI_NSBM_PALETTEMAPPED) && (((bitmap->width == width) &&
+				(bitmap->height == height) && (nsoption_int(cache_bitmaps) == 2)) ||
+				(nsoption_int(cache_bitmaps) >= 1)))) {
 			bitmap->nativebm = tbm;
 			if(type == AMI_NSBM_TRUECOLOUR) {
 				bitmap->nativebmwidth = bitmap->width;


-- 
NetSurf Browser



More information about the netsurf-commits mailing list