mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/bitmap-fonts

This commit is contained in:
Chris Young 2015-02-04 00:09:34 +00:00
parent 5bd9b45758 36bc32b87b
commit 20630d7991
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
amiga/object.c
View File

@ -31,16 +31,9 @@
struct MinList *NewObjList(void) struct MinList *NewObjList(void)
{ {
struct MinList *objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList), NULL);
struct MinList *objlist;
objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList) + 10, NULL);
#warning List structure allocation is larger than necessary for debugging ^^^^
NewMinList(objlist); NewMinList(objlist);
return(objlist); return(objlist);
} }
struct nsObject *AddObject(struct MinList *objlist, ULONG otype) struct nsObject *AddObject(struct MinList *objlist, ULONG otype)

6
amiga/plotters.c
View File

@ -106,8 +106,10 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
} else { } else {
palette_mapped = false; palette_mapped = false;
} }
#if 0
palette_mapped = true; /* only supporting palette mapped screens on OS3 for now */ #ifndef __amigaos4__
#warning OS3 locked to palette-mapped modes
palette_mapped = true;
if(depth > 8) depth = 8; if(depth > 8) depth = 8;
#endif #endif