diff options
| -rwxr-xr-x | amiga/gui.c | 2 | ||||
| -rwxr-xr-x | amiga/plotters.c | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 617b44f5d..f3670a4f6 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3883,7 +3883,7 @@ void gui_window_set_search_ico(hlcache_handle *ico) if (ico == NULL) ico = search_web_ico(); if ((ico != NULL) && (content_get_bitmap(ico) != NULL)) { - bm = ami_getcachenativebm(content_get_bitmap(ico), 16, 16, NULL); + bm = ami_bitmap_get_native(content_get_bitmap(ico), 16, 16, NULL); } node = (struct nsObject *)GetHead((struct List *)window_list); diff --git a/amiga/plotters.c b/amiga/plotters.c index bfa881362..66c996e71 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -642,12 +642,7 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma (y > glob->rect.MaxY)) return true; - if(palette_mapped == false) { - tbm = ami_getcachenativebm(bitmap, width, height, glob->rp->BitMap); - } else { - tbm = ami_bitmap_get_palettemapped(bitmap, width, height); - } - + tbm = ami_bitmap_get_native(bitmap, width, height, glob->rp->BitMap); if(!tbm) return true; #ifdef AMI_PLOTTER_DEBUG @@ -731,12 +726,7 @@ bool ami_bitmap_tile(int x, int y, int width, int height, if((bitmap->opaque == false) && (bitmap->width == 1) && (bitmap->height == 1)) return true; - if(palette_mapped == false) { - tbm = ami_getcachenativebm(bitmap,width,height,glob->rp->BitMap); - } else { - tbm = ami_bitmap_get_palettemapped(bitmap, width, height); - } - + tbm = ami_bitmap_get_native(bitmap,width,height,glob->rp->BitMap); if(!tbm) return true; ox = x; |