From 79271060fd5c2a640f349db73258e6c54c7ccc3c Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 22 Nov 2017 05:24:01 +0000 Subject: [PATCH] Revised BMP Datatype to correct problems in Save_BMP. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54950 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/classes/datatypes/bmp/bmpclass.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/workbench/classes/datatypes/bmp/bmpclass.c b/workbench/classes/datatypes/bmp/bmpclass.c index c09cf99faa..c45a28b7b3 100644 --- a/workbench/classes/datatypes/bmp/bmpclass.c +++ b/workbench/classes/datatypes/bmp/bmpclass.c @@ -657,17 +657,24 @@ static BOOL SaveBMP(struct IClass *cl, Object *o, struct dtWrite *dtw ) bmphandle->linebufpos = bmphandle->linebuf; /* write the chunky buffer to file, after encoding */ - - /* write end-of-BMP marker */ - if ( !bmphandle->filebufbytes-- && !SaveBMP_EmptyBuf(bmphandle, 1) ) + if ( !bmphandle->filebufbytes-- && !SaveBMP_EmptyBuf(bmphandle, widthxheight) ) { BMP_Exit(bmphandle, ERROR_NO_FREE_STORE); return FALSE; } - *(bmphandle->filebufpos)++ = ';'; + + /* write end-of-BMP marker */ + //if ( !bmphandle->filebufbytes-- && !SaveBMP_EmptyBuf(bmphandle, 1) ) + //{ + //BMP_Exit(bmphandle, ERROR_NO_FREE_STORE); + //return FALSE; + //} + //*(bmphandle->filebufpos)++ = ';'; + /* flush write buffer to file and exit */ - SaveBMP_EmptyBuf(bmphandle, 0); + //SaveBMP_EmptyBuf(bmphandle, 0); + D(bug("bmp.datatype/SaveBMP() --- Normal Exit\n")); BMP_Exit(bmphandle, 0); return TRUE; -- 2.11.4.GIT