mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Squash a minor warning from GCC

This commit is contained in:
Chris Young 2015-01-31 21:45:23 +00:00
parent 2544f60ae0
commit 7370e83d60
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amiga/bitmap.c
View File

@ -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) static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm)
{ {
#ifdef __amigaos4__
struct BitMap *tbm = NULL; struct BitMap *tbm = NULL;
#ifdef __amigaos4__
if(!bitmap) return NULL; if(!bitmap) return NULL;
@ -479,9 +479,8 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
bitmap->nativebmheight = height; bitmap->nativebmheight = height;
} }
} }
return tbm;
#endif #endif
return tbm;
} }
PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width, PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,

3
amiga/rtg.c
View File

@ -28,6 +28,9 @@ struct BitMap *ami_rtg_allocbitmap(ULONG width, ULONG height, ULONG depth,
ULONG flags, struct BitMap *friend, RGBFTYPE format) ULONG flags, struct BitMap *friend, RGBFTYPE format)
{ {
if(P96Base == NULL) { if(P96Base == NULL) {
#ifndef __amigaos4__
if(depth > 8) depth = 8;
#endif
return AllocBitMap(width, height, depth, flags, friend); return AllocBitMap(width, height, depth, flags, friend);
} else { } else {
return p96AllocBitMap(width, height, depth, flags, friend, format); return p96AllocBitMap(width, height, depth, flags, friend, format);

1
amiga/thumbnail.c
View File

@ -117,3 +117,4 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
return true; return true;
} }