From 09795a01ef859f072920de9df974d1b03b9ab9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 28 Dec 2016 20:24:50 +0100 Subject: New upstream version 4.2.4a --- app/bin/dbitmap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app/bin/dbitmap.c') diff --git a/app/bin/dbitmap.c b/app/bin/dbitmap.c index a1986c0..1c9c304 100644 --- a/app/bin/dbitmap.c +++ b/app/bin/dbitmap.c @@ -45,8 +45,8 @@ static drawCmd_t bitmap_d = { static int SaveBitmapFile( - const char * pathName, - const char * fileName, + int files, + char **fileName, void * data ) { coOrd p[4]; @@ -55,10 +55,10 @@ static int SaveBitmapFile( wFontSize_t fs; coOrd textsize, textsize1; - if (pathName == NULL) - return TRUE; - memcpy( curDirName, pathName, fileName-pathName ); - curDirName[fileName-pathName-1] = '\0'; + assert( fileName != NULL ); + assert( files == 1 ); + + SetCurrentPath( BITMAPPATHKEY, fileName[ 0 ] ); bitmap_d.d = wBitMapCreate( (wPos_t)bitmap_w, (wPos_t)bitmap_h, 8 ); if (bitmap_d.d == (wDraw_p)0) { @@ -118,7 +118,7 @@ static int SaveBitmapFile( bitmap_d.options &= ~DC_CENTERLINE; DrawTracks( &bitmap_d, bitmap_d.scale, bitmap_d.orig, bitmap_d.size ); InfoMessage( _("Writing BitMap to file") ); - if ( wBitMapWriteFile( bitmap_d.d, pathName ) == FALSE ) { + if ( wBitMapWriteFile( bitmap_d.d, fileName[0] ) == FALSE ) { NoticeMessage( MSG_WBITMAP_FAILED, _("Ok"), NULL ); return FALSE; } -- cgit v1.2.3