OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- use a TArray to pass the screenshot buffer

Browse source 
This also removes a few other explicit buffer allocations.
This commit is contained in:
Christoph Oelckers 2018-12-21 09:21:40 +01:00
commit cf18dbdfa7
6 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/m_misc.cpp
View file

@ -96,7 +96,7 @@ void M_FindResponseFile (void)
else
{
char **argv;
char *file = NULL;
TArray<uint8_t> file;
int argc = 0;
int size;
long argsize = 0;
@ -116,10 +116,9 @@ void M_FindResponseFile (void)
{
Printf ("Found response file %s!\n", Args->GetArg(i) + 1);
size = (int)fr.GetLength();
file = new char[size+1];
fr.Read (file, size);
file = fr.Read (size);
file[size] = 0;
argsize = ParseCommandLine (file, &argc, NULL);
argsize = ParseCommandLine ((char*)file.Data(), &argc, NULL);
}
}
else
@ -131,7 +130,7 @@ void M_FindResponseFile (void)
{
argv = (char **)M_Malloc (argc*sizeof(char *) + argsize);
argv[0] = (char *)argv + argc*sizeof(char *);
ParseCommandLine (file, NULL, argv);
ParseCommandLine ((char*)file.Data(), NULL, argv);
// Create a new argument vector
FArgs *newargs = new FArgs;
@ -161,10 +160,6 @@ void M_FindResponseFile (void)
// Remove the response file from the Args object
Args->RemoveArg(i);
}
if (file != NULL)
{
delete[] file;
}
}
}
if (added_stuff > 0)
@ -609,13 +604,12 @@ void M_ScreenShot (const char *filename)
}
// save the screenshot
const uint8_t *buffer;
int pitch;
ESSType color_type;
float gamma;
screen->GetScreenshotBuffer(buffer, pitch, color_type, gamma);
if (buffer != NULL)
auto buffer = screen->GetScreenshotBuffer(pitch, color_type, gamma);
if (buffer.Size() > 0)
{
PalEntry palette[256];
@ -627,21 +621,19 @@ void M_ScreenShot (const char *filename)
if (file == NULL)
{
Printf ("Could not open %s\n", autoname.GetChars());
delete[] buffer;
return;
}
if (writepcx)
{
WritePCXfile(file, buffer, palette, color_type,
WritePCXfile(file, buffer.Data(), palette, color_type,
screen->GetWidth(), screen->GetHeight(), pitch);
}
else
{
WritePNGfile(file, buffer, palette, color_type,
WritePNGfile(file, buffer.Data(), palette, color_type,
screen->GetWidth(), screen->GetHeight(), pitch, gamma);
}
delete file;
delete[] buffer;
if (!screenshot_quiet)
{