From 59af85e0b50f7343fe7c867cdb8cb868d7aac58f Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 5 Aug 2012 16:02:25 +0100 Subject: disable mask for now, causing colourisation problems --- amiga/bitmap.h | 2 +- amiga/plotters.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'amiga') diff --git a/amiga/bitmap.h b/amiga/bitmap.h index 3153ee7da..3b6f147ad 100755 --- a/amiga/bitmap.h +++ b/amiga/bitmap.h @@ -35,7 +35,7 @@ struct bitmap { struct BitMap *nativebm; int nativebmwidth; int nativebmheight; - APTR native_mask; + PLANEPTR native_mask; Object *dto; char *url; /* temporary storage space */ char *title; /* temporary storage space */ diff --git a/amiga/plotters.c b/amiga/plotters.c index 5c5c7fa13..ab880dbca 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -661,7 +661,7 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma } else { tag = BLITA_MaskPlane; tag_data = (ULONG)bitmap->native_mask; - minterm = (ABC|ABNC|ANBC); + minterm = 0xc0; /* Should be (ABC|ABNC|ANBC) */ } BltBitMapTags(BLITA_Width,width, @@ -826,7 +826,7 @@ static void ami_bitmap_tile_hook(struct Hook *hook,struct RastPort *rp,struct Ba } else { tag = BLITA_MaskPlane; tag_data = (ULONG)bfbm->mask; - minterm = (ABC|ABNC|ANBC); + minterm = 0xc0; /* Should be (ABC|ABNC|ANBC) */ } BltBitMapTags(BLITA_Width, bfbm->width, -- cgit v1.2.3