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
commit 20630d7991
2 changed files with 5 additions and 10 deletions

View File

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

View File

@ -106,8 +106,10 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
} else {
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;
#endif