mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-01 20:12:50 +02:00
Code Issues Projects Releases Wiki Activity

change some free/malloc's back to delete/new's

Browse Source
This commit is contained in:
jacob1
2013-01-12 21:06:52 -05:00
parent 0b6418b78d
commit 41751da619
4 changed files with 109 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/GameSave.cpp
View File

@@ -286,7 +286,7 @@ std::vector<char> GameSave::Serialise()
int dataSize; int dataSize;
char * data = Serialise(dataSize); char * data = Serialise(dataSize);
std::vector<char> dataVect(data, data+dataSize); std::vector<char> dataVect(data, data+dataSize);
free(data); delete data;
return dataVect; return dataVect;
} }
@@ -2004,7 +2004,7 @@ char * GameSave::serialiseOPS(int & dataLength)
finalData = (unsigned char *)bson_data(&b); finalData = (unsigned char *)bson_data(&b);
finalDataLen = bson_size(&b); finalDataLen = bson_size(&b);
outputDataLen = finalDataLen*2+12; outputDataLen = finalDataLen*2+12;
outputData = (unsigned char *)malloc(outputDataLen); outputData = new unsigned char[outputDataLen];
outputData[0] = 'O'; outputData[0] = 'O';
outputData[1] = 'P'; outputData[1] = 'P';

6
src/graphics/Graphics.cpp
View File

@@ -284,7 +284,7 @@ pixel *Graphics::resample_img_nn(pixel * src, int sw, int sh, int rw, int rh)
{ {
int y, x; int y, x;
pixel *q = NULL; pixel *q = NULL;
q = (pixel *)malloc(rw*rh*PIXELSIZE); q = new pixel[rw*rh];
for (y=0; y<rh; y++) for (y=0; y<rh; y++)
for (x=0; x<rw; x++){ for (x=0; x<rw; x++){
q[rw*y+x] = src[sw*(y*sh/rh)+(x*sw/rw)]; q[rw*y+x] = src[sw*(y*sh/rh)+(x*sw/rw)];
@@ -317,8 +317,8 @@ pixel *Graphics::resample_img(pixel *src, int sw, int sh, int rw, int rh)
samples[i] = new float[sourceWidth]; samples[i] = new float[sourceWidth];
} }
unsigned char * resultImage = (unsigned char*)malloc((resultHeight * resultPitch) * sizeof(unsigned char)); unsigned char * resultImage = new unsigned char[resultHeight * resultPitch];
memset(resultImage, 0, (resultHeight * resultPitch) * sizeof(unsigned char)); std::fill(resultImage, resultImage + (resultHeight*resultPitch), 0);
//Resample time //Resample time
int resultY = 0; int resultY = 0;

2
src/preview/PreviewView.cpp
View File

@@ -411,7 +411,7 @@ void PreviewView::NotifySaveChanged(PreviewModel * sender)
float factorY = ((float)YRES/2)/((float)savePreview->Size.Y); float factorY = ((float)YRES/2)/((float)savePreview->Size.Y);
float scaleFactor = factorY < factorX ? factorY : factorX; float scaleFactor = factorY < factorX ? factorY : factorX;
savePreview->Data = Graphics::resample_img(oldData, savePreview->Size.X, savePreview->Size.Y, savePreview->Size.X*scaleFactor, savePreview->Size.Y*scaleFactor); savePreview->Data = Graphics::resample_img(oldData, savePreview->Size.X, savePreview->Size.Y, savePreview->Size.X*scaleFactor, savePreview->Size.Y*scaleFactor);
free(oldData); delete oldData;
savePreview->Size.X *= scaleFactor; savePreview->Size.X *= scaleFactor;
savePreview->Size.Y *= scaleFactor; savePreview->Size.Y *= scaleFactor;
} }

10
src/search/Thumbnail.cpp
View File

@@ -16,7 +16,7 @@ Thumbnail::Thumbnail(const Thumbnail & thumb):
//Ensure the actual thumbnail data is copied //Ensure the actual thumbnail data is copied
if(thumb.Data) if(thumb.Data)
{ {
Data = (pixel *)malloc((thumb.Size.X*thumb.Size.Y) * PIXELSIZE); Data = new pixel[thumb.Size.X*thumb.Size.Y];
memcpy(Data, thumb.Data, (thumb.Size.X*thumb.Size.Y) * PIXELSIZE); memcpy(Data, thumb.Data, (thumb.Size.X*thumb.Size.Y) * PIXELSIZE);
} }
else else
@@ -33,7 +33,7 @@ Thumbnail::Thumbnail(int _id, int _datestamp, pixel * _data, ui::Point _size):
{ {
if(_data) if(_data)
{ {
Data = (pixel *)malloc((_size.X*_size.Y) * PIXELSIZE); Data = new pixel[_size.X*_size.Y];
memcpy(Data, _data, (_size.X*_size.Y) * PIXELSIZE); memcpy(Data, _data, (_size.X*_size.Y) * PIXELSIZE);
} }
else else
@@ -69,14 +69,12 @@ void Thumbnail::Resize(ui::Point newSize)
Data = Graphics::resample_img(thumbData, Size.X, Size.Y, Size.X * scaleFactor, Size.Y * scaleFactor); Data = Graphics::resample_img(thumbData, Size.X, Size.Y, Size.X * scaleFactor, Size.Y * scaleFactor);
Size.X *= scaleFactor; Size.X *= scaleFactor;
Size.Y *= scaleFactor; Size.Y *= scaleFactor;
free(thumbData); delete thumbData;
} }
} }
Thumbnail::~Thumbnail() Thumbnail::~Thumbnail()
{ {
if(Data) if(Data)
{ delete Data;
free(Data);
}
} }