Use base type for gfxbase

svn path=/trunk/netsurf/; revision=11249
This commit is contained in:
Chris Young 2011-01-07 18:21:01 +00:00
parent aec29351a6
commit 90fb7362c5
3 changed files with 7 additions and 4 deletions

View File

@ -26,6 +26,7 @@
#include <graphics/blitattr.h>
#include <graphics/composite.h>
#endif
#include <graphics/gfxbase.h>
#include "amiga/options.h"
#include <proto/datatypes.h>
#include <datatypes/pictureclass.h>
@ -359,7 +360,7 @@ struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int height,s
scaledbm = p96AllocBitMap(width, height, 32, BMF_DISPLAYABLE,
friendbm, AMI_BITMAP_FORMAT);
if(GfxBase->lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
if(GfxBase->LibNode.lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
{
uint32 comptype = COMPOSITE_Src;
uint32 flags = 0;

View File

@ -27,6 +27,7 @@
#include <libraries/gadtools.h>
#include <exec/types.h>
#include <intuition/classusr.h>
#include <graphics/gfxbase.h>
#include "amiga/object.h"
#include "amiga/font.h"
@ -426,7 +427,7 @@ void ami_gui_opts_open(void)
animspeeddisabled = TRUE;
}
if(GfxBase->lib_Version < 53)
if(GfxBase->LibNode.lib_Version < 53)
{
scaledisabled = TRUE;
scaleselected = FALSE;

View File

@ -23,6 +23,7 @@
#include <intuition/intuition.h>
#include <graphics/rpattr.h>
#include <graphics/gfxmacros.h>
#include <graphics/gfxbase.h>
#include "amiga/utf8.h"
#include "amiga/options.h"
#ifdef __amigaos4__
@ -549,7 +550,7 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma
LOG(("[ami_plotter] ami_bitmap() got native bitmap"));
#endif
if(GfxBase->lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
if(GfxBase->LibNode.lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
{
uint32 comptype = COMPOSITE_Src;
if(!bitmap->opaque)
@ -699,7 +700,7 @@ static void ami_bitmap_tile_hook(struct Hook *hook,struct RastPort *rp,struct Ba
for (xf = -bfbm->offsetx; xf < bfmsg->Bounds.MaxX; xf += bfbm->width) {
for (yf = -bfbm->offsety; yf < bfmsg->Bounds.MaxY; yf += bfbm->height) {
if(GfxBase->lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
if(GfxBase->LibNode.lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
{
CompositeTags(COMPOSITE_Src_Over_Dest,bfbm->bm,rp->BitMap,
COMPTAG_Flags,COMPFLAG_IgnoreDestAlpha,