From 3ba621759c4fb20dc35724414cb59c665686d418 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 7 Aug 2012 21:28:55 +0100 Subject: hide internal palette-mapped and true-colour bitmap conversion functions --- amiga/bitmap.c | 24 ++++++++++++------------ amiga/bitmap.h | 3 --- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'amiga') diff --git a/amiga/bitmap.c b/amiga/bitmap.c index 3358265d1..69dc2dc30 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -351,17 +351,7 @@ struct bitmap *ami_bitmap_from_datatype(char *filename) return bm; } -struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap, - int width, int height, struct BitMap *friendbm) -{ - if(ami_plot_screen_is_palettemapped() == true) { - return ami_bitmap_get_palettemapped(bitmap, width, height); - } else { - return ami_getcachenativebm(bitmap, width, height, friendbm); - } -} - -struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm) +static struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm) { struct RenderInfo ri; struct BitMap *tbm = NULL; @@ -477,7 +467,7 @@ struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int height,s return tbm; } -struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap, +static struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap, int width, int height) { struct BitMap *dtbm; @@ -521,3 +511,13 @@ struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap, return dtbm; } + +struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap, + int width, int height, struct BitMap *friendbm) +{ + if(ami_plot_screen_is_palettemapped() == true) { + return ami_bitmap_get_palettemapped(bitmap, width, height); + } else { + return ami_getcachenativebm(bitmap, width, height, friendbm); + } +} diff --git a/amiga/bitmap.h b/amiga/bitmap.h index ce5624c31..bf25e8ecf 100755 --- a/amiga/bitmap.h +++ b/amiga/bitmap.h @@ -44,9 +44,6 @@ struct bitmap { struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap, int width, int height, struct BitMap *friendbm); -struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm); -struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap, int width, int height); - Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap); struct bitmap *ami_bitmap_from_datatype(char *filename); #endif -- cgit v1.2.3