From 25a4cce542a9b4d0d9544d959f0c73021e7f3caf Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 2 Feb 2015 18:53:16 +0000 Subject: Experimentally enable P96 on the OS3 build --- amiga/bitmap.c | 11 +---------- amiga/plotters.c | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'amiga') diff --git a/amiga/bitmap.c b/amiga/bitmap.c index aabb6a3be..6da0fc26f 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -355,14 +355,6 @@ Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap) IDoMethod(dto, PDTM_WRITEPIXELARRAY, bitmap_get_buffer(bitmap), PBPAFMT_RGBA, bitmap_get_rowstride(bitmap), 0, 0, bitmap_get_width(bitmap), bitmap_get_height(bitmap)); -#if 0 - ami_bitmap_rgba_to_argb(bitmap); - IDoMethod(dto, PDTM_WRITEPIXELARRAY, bitmap_get_buffer(bitmap), - PBPAFMT_ARGB, bitmap_get_rowstride(bitmap), 0, 0, - bitmap_get_width(bitmap), bitmap_get_height(bitmap)); - ami_bitmap_argb_to_rgb(bitmap); -#endif - } return dto; @@ -400,7 +392,6 @@ 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) { struct BitMap *tbm = NULL; -#ifdef __amigaos4__ if(!bitmap) return NULL; @@ -497,7 +488,7 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width, bitmap->nativebmheight = height; } } -#endif + return tbm; } diff --git a/amiga/plotters.c b/amiga/plotters.c index f680e43b5..405e512f0 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -101,13 +101,12 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height) depth = GetBitMapAttr(scrn->RastPort.BitMap, BMA_DEPTH); LOG(("Screen depth = %d", depth)); -#ifdef __amigaos4__ if(depth < 16) { palette_mapped = true; } else { palette_mapped = false; } -#else +#if 0 palette_mapped = true; /* only supporting palette mapped screens on OS3 for now */ if(depth > 8) depth = 8; #endif -- cgit v1.2.3