mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-23 09:54:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

first attempt to create our own mask of only wholly transparent pixels.

Browse Source
This commit is contained in:
Chris Young 2012-08-09 21:59:47 +01:00
parent 56967bbf06
commit e4d2677c80
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
amiga/bitmap.c
View File

@ -120,16 +120,20 @@ void bitmap_destroy(void *bitmap)
{
if((bm->nativebm) && (bm->dto == NULL)) {
p96FreeBitMap(bm->nativebm);
bm->nativebm = NULL;
}
if(bm->dto) {
DisposeDTObject(bm->dto);
bm->dto = NULL;
}
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height);
FreeVec(bm->pixdata);
bm->pixdata = NULL;
bm->nativebm = NULL;
bm->native_mask = NULL;
bm->dto = NULL;
FreeVec(bm);
bm = NULL;
}
@ -174,6 +178,8 @@ void bitmap_modified(void *bitmap) {
p96FreeBitMap(bm->nativebm);
if(bm->dto) DisposeDTObject(bm->dto);
if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height);
bm->nativebm = NULL;
bm->dto = NULL;
bm->native_mask = NULL;
@ -468,6 +474,31 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
return tbm;
}
static PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width, int height)
{
uint32 *bmi = (uint32 *) bitmap->pixdata;
UBYTE maskbit = 0;
int y, x;
if((height != bitmap->height) || (width != bitmap->width)) return NULL;
if(bitmap_get_opaque(bitmap) == true) return NULL;
if(bitmap->native_mask) return bitmap->native_mask;
bitmap->native_mask = AllocRaster(width, height);
for(y=0; y<height; y++) {
for(x=0; x<width; x++) {
if ((*bmi & 0xff000000U) == 0x00000000U) maskbit = 1;
else maskbit = 0;
bmi++;
bitmap->native_mask[(y*4) + (x/8)] =
(bitmap->native_mask[(y*4) + (x/8)] << 1) | maskbit;
}
}
return bitmap->native_mask;
}
static struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap,
int width, int height)
{
@ -504,12 +535,14 @@ static struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap,
GetDTAttrs(bitmap->dto,
PDTA_DestBitMap, &dtbm,
PDTA_MaskPlane, &bitmap->native_mask,
//PDTA_MaskPlane, &bitmap->native_mask,
TAG_END);
bitmap->nativebmwidth = width;
bitmap->nativebmheight = height;
ami_bitmap_get_mask(bitmap, width, height);
return dtbm;
}

5
amiga/plotters.c
View File

@ -678,9 +678,10 @@ 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 = 0xc0; /* should be (ABC|ABNC|ANBC); */
minterm = (ABC|ABNC|ANBC);
}
//BltMaskBitMapRastPort(tbm, 0, 0, glob->rp, x, y, width, height, (ABC|ABNC|ANBC), bitmap->native_mask);
BltBitMapTags(BLITA_Width,width,
BLITA_Height,height,
BLITA_Source,tbm,