diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-03-22 19:26:36 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-03-22 19:26:36 +0000 |
| commit | 4b2ac84233dc464567d1c0b1a500f7ce38a8b3cd (patch) | |
| tree | e3244100ca58bc2cd040e2f5cc840ecb5a3dac6b /amiga/icon.c | |
| parent | bd663be92766de17e5dbef62ae98ca0cbb26cc7c (diff) | |
| download | netsurf-4b2ac84233dc464567d1c0b1a500f7ce38a8b3cd.tar.gz netsurf-4b2ac84233dc464567d1c0b1a500f7ce38a8b3cd.tar.bz2 | |
Make struct bitmap private to bitmap.c
Diffstat (limited to 'amiga/icon.c')
| -rw-r--r-- | amiga/icon.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/amiga/icon.c b/amiga/icon.c index f77f2eb6e..0ef3dbb12 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -493,12 +493,16 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm) { struct DiskObject *dobj; struct BitMap *bitmap; + ULONG *icondata; + #ifdef __amigaos4__ if(bm) { + icondata = ami_bitmap_get_icondata(bm); + bitmap = ami_bitmap_get_native(bm, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, NULL); - bm->icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL); + icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL); BltBitMapTags(BLITA_Width, THUMBNAIL_WIDTH, BLITA_Height, THUMBNAIL_HEIGHT, @@ -506,7 +510,7 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm) BLITA_Source, bitmap, BLITA_DestType, BLITT_ARGB32, BLITA_DestBytesPerRow, THUMBNAIL_WIDTH * 4, - BLITA_Dest, bm->icondata, + BLITA_Dest, icondata, TAG_DONE); } #endif @@ -520,7 +524,7 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm) ICONCTRLA_SetImageDataFormat, IDFMT_DIRECTMAPPED, ICONCTRLA_SetWidth, THUMBNAIL_WIDTH, ICONCTRLA_SetHeight, THUMBNAIL_HEIGHT, - ICONCTRLA_SetImageData1, bm->icondata, + ICONCTRLA_SetImageData1, icondata, ICONCTRLA_SetImageData2, NULL, TAG_DONE); } @@ -537,5 +541,6 @@ void amiga_icon_free(struct DiskObject *dobj) struct bitmap *bm = dobj->do_Gadget.UserData; FreeDiskObject(dobj); - if(bm) FreeVec(bm->icondata); + if(bm) FreeVec(ami_bitmap_get_icondata(bm)); } + |