aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/bitmap.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2011-07-10 17:56:29 +1000
committerPaul Gilbert2011-07-10 17:56:29 +1000
commit88c7b25e5b0cdf8bb0709f0f7e728f637e72b33c (patch)
tree7b06127526cd335b4913aaaf22595a29aa0a038e /engines/cge/bitmap.cpp
parent1870f09d3131ea6b9e2646343e5191cda614b49b (diff)
downloadscummvm-rg350-88c7b25e5b0cdf8bb0709f0f7e728f637e72b33c.tar.gz
scummvm-rg350-88c7b25e5b0cdf8bb0709f0f7e728f637e72b33c.tar.bz2
scummvm-rg350-88c7b25e5b0cdf8bb0709f0f7e728f637e72b33c.zip
CGE: Fixed more free/delete[] mismatches identified by Valgrind
Diffstat (limited to 'engines/cge/bitmap.cpp')
-rw-r--r--engines/cge/bitmap.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp
index 4630f87456..a8264e6c3f 100644
--- a/engines/cge/bitmap.cpp
+++ b/engines/cge/bitmap.cpp
@@ -151,7 +151,7 @@ Bitmap::~Bitmap() {
delete[](uint8 *) _v;
break;
case FAR_MEM :
- free(_v);
+ delete[] _v;
default:
warning("Unhandled MemType in Bitmap destructor");
break;
@@ -206,7 +206,7 @@ BMP_PTR Bitmap::code() {
delete[](uint8 *) _v;
break;
case FAR_MEM :
- free(_v);
+ delete[] _v;
break;
default:
warning("Unhandled MemType in Bitmap::Code()");
@@ -294,7 +294,7 @@ BMP_PTR Bitmap::code() {
break;
uint16 sizV = (uint16)(im - 2 - _v);
- _v = farnew(uint8, sizV + _h * sizeof(*_b));
+ _v = new uint8[sizV + _h * sizeof(*_b)];
if (!_v)
error("No core");
@@ -436,7 +436,7 @@ bool Bitmap::loadVBM(XFile *f) {
f->seek(f->mark() + PAL_SIZ);
}
}
- if ((_v = farnew(uint8, n)) == NULL)
+ if ((_v = new uint8[n]) == NULL)
return false;
if (f->_error == 0)