m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save_GOS(): pad with 0's and fix memory leak

Browse Source
This commit is contained in:
Thomas Bernard 2019-12-21 18:41:27 +01:00
parent 60c3f0b4ed
commit 109143ecd2
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cpcformats.c
View File

@ -853,17 +853,22 @@ void Save_GOS(T_IO_Context* context)
context->Height = 168; // Convert the first half context->Height = 168; // Convert the first half
// convert and save page 1 // convert and save page 1
output = raw2crtc(context, 0, 7, &outsize, &r1, 0, 0);
file = Open_file_write(context); file = Open_file_write(context);
if (file == NULL) if (file == NULL)
return; return;
output = raw2crtc(context, 0, 7, &outsize, &r1, 0, 0);
File_error = 0; File_error = 0;
if (!Write_bytes(file, output, outsize)) if (!Write_bytes(file, output, outsize))
File_error = 1; File_error = 1;
// Pad to expected size // Pad to expected size
// TODO: pad with 0s ? GFX2_Log(GFX2_DEBUG, "written %lu bytes, padding to 16384\n", outsize);
if (!Write_bytes(file, output, 16384 - outsize)) if (outsize >= 8192)
File_error = 1; {
memset(output, 0, 16384 - outsize);
if (!Write_bytes(file, output, 16384 - outsize))
File_error = 1;
}
free(output);
fclose(file); fclose(file);
if (File_error) if (File_error)
return; return;
@ -872,19 +877,25 @@ void Save_GOS(T_IO_Context* context)
// Advance context to second half of picture // Advance context to second half of picture
context->Target_address += context->Pitch * 168; context->Target_address += context->Pitch * 168;
context->Height = 104; context->Height = 104;
output = raw2crtc(context, 0, 7, &outsize, &r1, 0, 0);
file = Open_file_write_with_alternate_ext(context, "GO2"); file = Open_file_write_with_alternate_ext(context, "GO2");
if (file == NULL) if (file == NULL)
{ {
File_error = 1; File_error = 1;
return; return;
} }
output = raw2crtc(context, 0, 7, &outsize, &r1, 0, 0);
File_error = 0; File_error = 0;
if (!Write_bytes(file, output, outsize)) if (!Write_bytes(file, output, outsize))
File_error = 1; File_error = 1;
// Pad to expected size // Pad to expected size
if (!Write_bytes(file, output, 16384 - outsize)) GFX2_Log(GFX2_DEBUG, "written %lu bytes, padding to 16384\n", outsize);
File_error = 1; if (outsize >= 8192)
{
memset(output, 0, 16384 - outsize);
if (!Write_bytes(file, output, 16384 - outsize))
File_error = 1;
}
free(output);
fclose(file); fclose(file);
if (File_error) if (File_error)
return; return;

2
tests/pic-samples

@ -1 +1 @@
Subproject commit 241daff8186a0da1a0b01edd02aa64bb68a203c7 Subproject commit 4ded306347cd1fb72a385daf40537b01705943ef