summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-01-06 23:26:38 (GMT)
committer jacob1 <jfu614@gmail.com>2013-01-06 23:26:38 (GMT)
commitd1abfc313eb3d6508a35cbef458739b4d7c3f857 (patch)
tree9dac6a8ba124d916d20635fe8b6b41879ddaea42 /src
parent8e09651990d45d8b25b8795cbd1cfffeecfd3f5f (diff)
downloadpowder-d1abfc313eb3d6508a35cbef458739b4d7c3f857.zip
powder-d1abfc313eb3d6508a35cbef458739b4d7c3f857.tar.gz
fix mismatched free()/delete's
Diffstat (limited to 'src')
-rw-r--r--src/client/GameSave.cpp2
-rw-r--r--src/graphics/Graphics.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index 7103113..8d8a95c 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -286,7 +286,7 @@ std::vector<char> GameSave::Serialise()
int dataSize;
char * data = Serialise(dataSize);
std::vector<char> dataVect(data, data+dataSize);
- delete data;
+ free(data);
return dataVect;
}
diff --git a/src/graphics/Graphics.cpp b/src/graphics/Graphics.cpp
index 974a169..54544d3 100644
--- a/src/graphics/Graphics.cpp
+++ b/src/graphics/Graphics.cpp
@@ -317,8 +317,8 @@ pixel *Graphics::resample_img(pixel *src, int sw, int sh, int rw, int rh)
samples[i] = new float[sourceWidth];
}
- unsigned char * resultImage = new unsigned char[resultHeight * resultPitch];
- std::fill(resultImage, resultImage + (resultHeight*resultPitch), 0);
+ unsigned char * resultImage = (unsigned char*)malloc((resultHeight * resultPitch) * sizeof(unsigned char));
+ memset(resultImage, 0, (resultHeight * resultPitch) * sizeof(unsigned char));
//Resample time
int resultY = 0;