use abstracted function

This commit is contained in:
Chris Young 2012-08-07 21:22:51 +01:00
parent dd7935bb1f
commit 0d8aca4f12
2 changed files with 3 additions and 13 deletions

View File

@ -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);

View File

@ -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;