From 90fb7362c5fff521f16faf5d6a39edba30f588b0 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Fri, 7 Jan 2011 18:21:01 +0000
Subject: Use base type for gfxbase

svn path=/trunk/netsurf/; revision=11249
---
 amiga/bitmap.c      | 3 ++-
 amiga/gui_options.c | 3 ++-
 amiga/plotters.c    | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'amiga')

diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 2adcce526..31297e88e 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -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;
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 175b5b5e3..19b95d312 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -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;
diff --git a/amiga/plotters.c b/amiga/plotters.c
index f433ae86d..f89b12c04 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -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,
-- 
cgit v1.2.3