From 7a2fb9222a3dd19a1ef7eaf70938806a1be753ee Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 16 May 2009 17:30:25 +0000 Subject: IFF save now works - needed an unexpected NULL as the first parameter to DTM_WRITE DTA_ObjName is now the URL, as this is the only field that is being written by picture.datatype (bug in picture.datatype?). ObjAuthor and ObjAnnotation left in as the DTM_COPY method might be able to use them. svn path=/trunk/netsurf/; revision=7518 --- amiga/bitmap.c | 6 +++--- amiga/clipboard.c | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/amiga/bitmap.c b/amiga/bitmap.c index 50627155f..4cbfe90ac 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -135,7 +135,7 @@ bool bitmap_save(void *bitmap, const char *path, unsigned flags) { if(fh = Open(path,MODE_NEWFILE)) { - DoDTMethod(dto,NULL,NULL,DTM_WRITE,fh,0,NULL); + DoDTMethod(dto,NULL,NULL,DTM_WRITE,NULL,fh,DTWM_IFF,NULL); Close(fh); } @@ -286,8 +286,8 @@ Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap) } SetDTAttrs(dto,NULL,NULL, - DTA_ObjName,bitmap->title, - DTA_ObjAnnotation,bitmap->url, + DTA_ObjName,bitmap->url, + DTA_ObjAnnotation,bitmap->title, DTA_ObjAuthor,messages_get("NetSurf"), DTA_NominalHoriz,bitmap_get_width(bitmap), DTA_NominalVert,bitmap_get_height(bitmap), diff --git a/amiga/clipboard.c b/amiga/clipboard.c index 94457f40a..51b8e3100 100755 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -31,16 +31,7 @@ #include #include "amiga/bitmap.h" -#ifndef ID_AUTH -#define ID_AUTH MAKE_ID('A','U','T','H') -#endif - -#ifndef ID_ANNO -#define ID_ANNO MAKE_ID('A','N','N','O') -#endif - struct IFFHandle *iffh = NULL; -const char * const netsurf_version; void ami_clipboard_init(void) { -- cgit v1.2.3