matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use C++ allocation and deletion for Brush memory

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-18 14:46:18 +01:00
parent 2717a17127
commit 1a13c3edec
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/Brush.h
View File

@ -25,8 +25,8 @@ protected:
if(!bitmap) if(!bitmap)
return; return;
if(outline) if(outline)
free(outline); delete[] outline;
outline = (unsigned char *)calloc(size.X*size.Y, sizeof(unsigned char)); outline = new unsigned char[size.X*size.Y];
for(int x = 0; x < size.X; x++) for(int x = 0; x < size.X; x++)
{ {
for(int y = 0; y < size.Y; y++) for(int y = 0; y < size.Y; y++)
@ -69,9 +69,9 @@ public:
} }
virtual ~Brush() { virtual ~Brush() {
if(bitmap) if(bitmap)
delete bitmap; delete[] bitmap;
if(outline) if(outline)
delete outline; delete[] outline;
} }
virtual void RenderRect(Graphics * g, ui::Point position1, ui::Point position2) virtual void RenderRect(Graphics * g, ui::Point position1, ui::Point position2)
{ {
@ -109,8 +109,8 @@ public:
virtual void GenerateBitmap() virtual void GenerateBitmap()
{ {
if(bitmap) if(bitmap)
free(bitmap); delete[] bitmap;
bitmap = (unsigned char *)calloc((size.X*size.Y), sizeof(unsigned char)); bitmap = new unsigned char[size.X*size.Y];
for(int x = 0; x < size.X; x++) for(int x = 0; x < size.X; x++)
{ {
for(int y = 0; y < size.Y; y++) for(int y = 0; y < size.Y; y++)

4
src/game/EllipseBrush.h
View File

@ -22,8 +22,8 @@ public:
virtual void GenerateBitmap() virtual void GenerateBitmap()
{ {
if(bitmap) if(bitmap)
free(bitmap); delete[] bitmap;
bitmap = (unsigned char*)calloc((size.X*size.Y), sizeof(unsigned char)); bitmap = new unsigned char[size.X*size.Y];
int rx = radius.X; int rx = radius.X;
int ry = radius.Y; int ry = radius.Y;
for(int x = 0; x <= radius.X*2; x++) for(int x = 0; x <= radius.X*2; x++)