mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-31 06:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove some p96 usage

Browse Source
This commit is contained in:
Chris Young 2015-01-20 00:39:32 +00:00
parent 4cf9d888ff
commit 2b9df1b2cd
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amiga/bitmap.c
View File

@ -19,8 +19,8 @@
#include "amiga/os3support.h"
#include <proto/exec.h>
#include <proto/Picasso96API.h>
#ifdef __amigaos4__
#include <proto/Picasso96API.h>
#include <graphics/blitattr.h>
#include <graphics/composite.h>
#endif
@ -388,6 +388,7 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm)
{
#ifdef __amigaos4__
struct RenderInfo ri;
struct BitMap *tbm = NULL;
struct RastPort trp;
@ -495,6 +496,7 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
}
return tbm;
#endif
}
PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
@ -581,3 +583,4 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap,
return ami_bitmap_get_truecolour(bitmap, width, height, friendbm);
}
}

7
amiga/gui.c
View File

@ -34,8 +34,8 @@
#include <proto/intuition.h>
#include <proto/keymap.h>
#include <proto/locale.h>
#include <proto/Picasso96API.h>
#ifdef __amigaos4__
#include <proto/Picasso96API.h>
#include <proto/popupmenu.h>
#endif
#include <proto/utility.h>
@ -5174,6 +5174,11 @@ Object *ami_gui_splash_open(void)
LAYOUT_AddImage, bm_obj = BitMapObject,
BITMAP_SourceFile, "PROGDIR:Resources/splash.png",
BITMAP_Screen, wbscreen,
BITMAP_Precision, PRECISION_IMAGE,
#ifndef __amigaos4__
BITMAP_Width, 400,
BITMAP_Height, 250,
#endif
BitMapEnd,
LayoutEnd,
EndWindow;

4
amiga/libs.c
View File

@ -76,6 +76,7 @@
#ifdef __amigaos4__
AMINS_LIB_STRUCT(Application);
AMINS_LIB_STRUCT(P96);
#else
struct UtilityBase *UtilityBase; /* AMINS_LIB_STRUCT(Utility) */
#endif
@ -90,7 +91,6 @@ AMINS_LIB_STRUCT(Intuition);
AMINS_LIB_STRUCT(Keymap);
AMINS_LIB_STRUCT(Layers);
AMINS_LIB_STRUCT(Locale);
AMINS_LIB_STRUCT(P96);
AMINS_LIB_STRUCT(Workbench);
AMINS_LIB_STRUCT(ARexx);
@ -213,10 +213,10 @@ void ami_libs_close(void)
AMINS_LIB_CLOSE(Keymap)
AMINS_LIB_CLOSE(Layers)
AMINS_LIB_CLOSE(Locale)
AMINS_LIB_CLOSE(P96)
AMINS_LIB_CLOSE(Workbench)
#ifdef __amigaos4__
AMINS_LIB_CLOSE(Application)
AMINS_LIB_CLOSE(P96)
#else
AMINS_LIB_CLOSE(Utility)
#endif

5
amiga/os3support.h
View File

@ -149,6 +149,11 @@
#define IDoSuperMethodA DoSuperMethodA
#define ShowWindow(...) (void)0
/* P96 */
#define p96FreeBitMap(B) FreeBitMap(B)
#define p96AllocBitMap(W,H,D,FL,FR,FM) AllocBitMap(W,H,D,FL,FR)
#define p96RectFill(RP,X,Y,XW,YH,C) RectFill(RP,X,Y,XW,YH) /* Needs pen */
/* Utility */
#define SetMem memset
#define SNPrintf snprintf

2
amiga/plotters.c
View File

@ -18,7 +18,9 @@
#include "amiga/os3support.h"
#ifdef __amigaos4__
#include <proto/Picasso96API.h>
#endif
#include <proto/exec.h>
#include <proto/intuition.h>

2
amiga/thumbnail.c
View File

@ -19,7 +19,9 @@
#include "amiga/os3support.h"
#include <proto/graphics.h>
#ifdef __amigaos4__
#include <proto/Picasso96API.h>
#endif
#include <intuition/intuition.h>
#ifdef __amigaos4__
#include <graphics/blitattr.h>