summaryrefslogtreecommitdiff
path: root/src/search/Thumbnail.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-01-13 02:06:52 (GMT)
committer jacob1 <jfu614@gmail.com>2013-01-13 02:06:52 (GMT)
commit41751da6190a6d9a893bbe4cbf91f48cb5fceda5 (patch)
treedf4f87fc970683d64b2eb5e60c25c228cfa68ac8 /src/search/Thumbnail.cpp
parent0b6418b78d43ea1215b9eac36a686b601872efc7 (diff)
downloadpowder-41751da6190a6d9a893bbe4cbf91f48cb5fceda5.zip
powder-41751da6190a6d9a893bbe4cbf91f48cb5fceda5.tar.gz
change some free/malloc's back to delete/new's
Diffstat (limited to 'src/search/Thumbnail.cpp')
-rw-r--r--src/search/Thumbnail.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/search/Thumbnail.cpp b/src/search/Thumbnail.cpp
index e1bc6f8..81ea8e9 100644
--- a/src/search/Thumbnail.cpp
+++ b/src/search/Thumbnail.cpp
@@ -16,7 +16,7 @@ Thumbnail::Thumbnail(const Thumbnail & thumb):
//Ensure the actual thumbnail data is copied
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);
}
else
@@ -33,7 +33,7 @@ Thumbnail::Thumbnail(int _id, int _datestamp, pixel * _data, ui::Point _size):
{
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);
}
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);
Size.X *= scaleFactor;
Size.Y *= scaleFactor;
- free(thumbData);
+ delete thumbData;
}
}
Thumbnail::~Thumbnail()
{
if(Data)
- {
- free(Data);
- }
+ delete Data;
}