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

Changes on brushes memory management, in preparation for Issue 362

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1699 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2011-01-27 19:52:36 +00:00
parent 4175226a4a
commit 40a7bcf40e
6 changed files with 304 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/loadsave.c
View File

@@ -48,6 +48,7 @@
#include "struct.h"
#include "windows.h"
#include "engine.h"
#include "brush.h"
// -- PKM -------------------------------------------------------------------
void Test_PKM(T_IO_Context *);
@@ -773,19 +774,13 @@ void Load_image(T_IO_Context *context)
}
else if (context->Type == CONTEXT_BRUSH && File_error==0)
{
free(Brush);
Brush=context->Buffer_image;
context->Buffer_image = NULL;
Brush_width=context->Width;
Brush_height=context->Height;
free(Smear_brush);
Smear_brush_width=(Brush_width>MAX_PAINTBRUSH_SIZE)?Brush_width:MAX_PAINTBRUSH_SIZE;
Smear_brush_height=(Brush_height>MAX_PAINTBRUSH_SIZE)?Brush_height:MAX_PAINTBRUSH_SIZE;
Smear_brush=(byte *)malloc(Smear_brush_width*Smear_brush_height);
if (!Smear_brush)
if (Realloc_brush(context->Width, context->Height, context->Buffer_image, NULL))
{
File_error=3;
free(context->Buffer_image);
}
context->Buffer_image = NULL;
}
else if (context->Type == CONTEXT_SURFACE)
{