Gitweb links:

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

The branch, master has been updated
       via  39dcd22b05342e639c587de8e1af382e7dee2454 (commit)
      from  d39f98065a7c52c63e3c037a0a64f94186c3ce00 (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=39dcd22b05342e639c587de8e1af382e7dee2454
commit 39dcd22b05342e639c587de8e1af382e7dee2454
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Fix logic in the rare case we're running 8-bit and have a cached full-size 
native BitMap but need a scaled one.

diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index a7271f8..76dae21 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -477,10 +477,12 @@ static inline struct BitMap 
*ami_bitmap_get_generic(struct bitmap *bitmap,
                        }
                        bitmap->native = type;
                }
+
+               if(type == AMI_NSBM_PALETTEMAPPED)
+                       return tbm;
        }
 
-       if(((bitmap->width != width) || (bitmap->height != height)) &&
-               (type == AMI_NSBM_TRUECOLOUR)) {
+       if((bitmap->width != width) || (bitmap->height != height)) {
                struct BitMap *restrict scaledbm;
                struct BitScaleArgs bsa;
                int depth = 32;


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

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 a7271f8..76dae21 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -477,10 +477,12 @@ static inline struct BitMap 
*ami_bitmap_get_generic(struct bitmap *bitmap,
                        }
                        bitmap->native = type;
                }
+
+               if(type == AMI_NSBM_PALETTEMAPPED)
+                       return tbm;
        }
 
-       if(((bitmap->width != width) || (bitmap->height != height)) &&
-               (type == AMI_NSBM_TRUECOLOUR)) {
+       if((bitmap->width != width) || (bitmap->height != height)) {
                struct BitMap *restrict scaledbm;
                struct BitScaleArgs bsa;
                int depth = 32;


-- 
NetSurf Browser

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to