Squash a minor warning from GCC
This commit is contained in:
parent
2544f60ae0
commit
7370e83d60
|
@ -381,8 +381,8 @@ 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 BitMap *tbm = NULL;
|
||||
#ifdef __amigaos4__
|
||||
|
||||
if(!bitmap) return NULL;
|
||||
|
||||
|
@ -479,9 +479,8 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
|
|||
bitmap->nativebmheight = height;
|
||||
}
|
||||
}
|
||||
|
||||
return tbm;
|
||||
#endif
|
||||
return tbm;
|
||||
}
|
||||
|
||||
PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
|
||||
|
|
|
@ -28,6 +28,9 @@ struct BitMap *ami_rtg_allocbitmap(ULONG width, ULONG height, ULONG depth,
|
|||
ULONG flags, struct BitMap *friend, RGBFTYPE format)
|
||||
{
|
||||
if(P96Base == NULL) {
|
||||
#ifndef __amigaos4__
|
||||
if(depth > 8) depth = 8;
|
||||
#endif
|
||||
return AllocBitMap(width, height, depth, flags, friend);
|
||||
} else {
|
||||
return p96AllocBitMap(width, height, depth, flags, friend, format);
|
||||
|
|
|
@ -117,3 +117,4 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue