mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 17:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use GuiGFX to scale 8-bit images rather than doing two separate operations

Browse Source
This commit is contained in:
Chris Young 2016-07-08 19:57:42 +01:00
parent dc633bc154
commit ddcc914a3f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontends/amiga/bitmap.c
View File

@ -309,7 +309,7 @@ static void ami_bitmap_rgba_to_argb(struct bitmap *bm)
ULONG *data = (ULONG *)amiga_bitmap_get_buffer(bm); ULONG *data = (ULONG *)amiga_bitmap_get_buffer(bm);
for(int i = 0; i < (bm->width * bm->height); i++) { for(int i = 0; i < (bm->width * bm->height); i++) {
data[i] = (data[i] >> 8) | (data[i] << 24); data[i] = (data[ i] >> 8) | (data[i] << 24);
} }
} }
@ -426,7 +426,7 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap,
tbm, bitmap->width, bitmap->height, tbm, bitmap->width, bitmap->height,
bitmap->width * 4, AMI_BITMAP_FORMAT); bitmap->width * 4, AMI_BITMAP_FORMAT);
} else { } else {
tbm = ami_rtg_allocbitmap(bitmap->width, bitmap->height, tbm = ami_rtg_allocbitmap(width, height,
8, 0, friendbm, AMI_BITMAP_FORMAT); 8, 0, friendbm, AMI_BITMAP_FORMAT);
if(tbm == NULL) return NULL; if(tbm == NULL) return NULL;
@ -450,7 +450,7 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap,
APTR ddh = CreateDirectDrawHandle(bitmap->drawhandle, APTR ddh = CreateDirectDrawHandle(bitmap->drawhandle,
bitmap->width, bitmap->height, bitmap->width, bitmap->height,
bitmap->width, bitmap->height, NULL); width, height, NULL);
DirectDrawTrueColor(ddh, (ULONG *)amiga_bitmap_get_buffer(bitmap), 0, 0, TAG_DONE); DirectDrawTrueColor(ddh, (ULONG *)amiga_bitmap_get_buffer(bitmap), 0, 0, TAG_DONE);
DeleteDirectDrawHandle(ddh); DeleteDirectDrawHandle(ddh);
@ -466,14 +466,19 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap,
if(nsoption_int(cache_bitmaps) == 2) if(nsoption_int(cache_bitmaps) == 2)
{ {
bitmap->nativebm = tbm; bitmap->nativebm = tbm;
bitmap->nativebmwidth = bitmap->width; if(type == AMI_NSBM_TRUECOLOUR) {
bitmap->nativebmheight = bitmap->height; bitmap->nativebmwidth = bitmap->width;
bitmap->nativebmheight = bitmap->height;
} else {
bitmap->nativebmwidth = width;
bitmap->nativebmheight = height;
}
bitmap->native = type; bitmap->native = type;
} }
} }
if((bitmap->width != width) || (bitmap->height != height)) if(((bitmap->width != width) || (bitmap->height != height)) &&
{ (type == AMI_NSBM_TRUECOLOUR)) {
struct BitMap *restrict scaledbm; struct BitMap *restrict scaledbm;
struct BitScaleArgs bsa; struct BitScaleArgs bsa;
int depth = 32; int depth = 32;