Ticket #8598: nut-allocate.diff

engines/scumm/nut_renderer.cpp

@@ -30 +30 @@
 NutRenderer::NutRenderer(ScummEngine *vm) :
         _vm(vm),
         _loaded(false),
-        _numChars(0) {
+        _numChars(0),
+        _decodedData(0) {
         memset(_chars, 0, sizeof(_chars));
 }
 
 NutRenderer::~NutRenderer() {
-        for (int i = 0; i < _numChars; i++) {
-                delete []_chars[i].src;
-        }
+        delete [] _decodedData;
 }
 
 void smush_decode_codec1(byte *dst, const byte *src, int left, int top, int width, int height, int pitch);
@@ -89 +88 @@
         }
 
         uint32 length = file.readUint32BE();
-        byte *dataSrc = (byte *)malloc(length);
+        byte *dataSrc = new byte[length];
         file.read(dataSrc, length);
         file.close();
 
@@ -99 +98 @@
                 return false;
         }
 
+        // We pre-decode the font, which may seem wasteful at first. Actually,
+        // the memory needed for just the decoded glyphs is smaller than the
+        // whole of the undecoded font file.
+
         _numChars = READ_LE_UINT16(dataSrc + 10);
         assert(_numChars <= ARRAYSIZE(_chars));
+
         uint32 offset = 0;
+        uint32 decodedLength = 0;
         for (int l = 0; l < _numChars; l++) {
+                offset += READ_BE_UINT32(dataSrc + offset + 4) + 16;
+                int width = READ_LE_UINT16(dataSrc + offset + 14);
+                int height = READ_LE_UINT16(dataSrc + offset + 16);
+                decodedLength += (width * height);
+        }
+
+        // If characters have transparency, then bytes just get skipped and
+        // so there may appear some garbage. That's why we have to fill it
+        // with zeroes first.
+
+        _decodedData = new byte[decodedLength];
+        memset(_decodedData, 0, decodedLength);
+
+        byte *decodedPtr = _decodedData;
+
+        offset = 0;
+        for (int l = 0; l < _numChars; l++) {
                 offset += READ_BE_UINT32(dataSrc + offset + 4) + 8;
                 if (READ_BE_UINT32(dataSrc + offset) != 'FRME') {
                         error("NutRenderer::loadFont(%s) there is no FRME chunk %d (offset %x)", filename, l, offset);
@@ -118 +140 @@
                 _chars[l].yoffs = READ_LE_UINT16(dataSrc + offset + 12);
                 _chars[l].width = READ_LE_UINT16(dataSrc + offset + 14);
                 _chars[l].height = READ_LE_UINT16(dataSrc + offset + 16);
-                const int srcSize = _chars[l].width * _chars[l].height;
-                _chars[l].src = new byte[srcSize];
-                // If characters have transparency, then bytes just get skipped and
-                // so there may appear some garbage. That's why we have to fill it
-                // with zeroes first.
-                memset(_chars[l].src, 0, srcSize);
+                _chars[l].src = decodedPtr;
 
+                decodedPtr += (_chars[l].width * _chars[l].height);
+
                 const uint8 *fobjptr = dataSrc + offset + 22;
                 switch (codec) {
                 case 1:
@@ -139 +158 @@
                 }
         }
 
-        free(dataSrc);
+        delete [] dataSrc;
         _loaded = true;
         return true;
 }

engines/scumm/nut_renderer.h

@@ -34 +34 @@
         ScummEngine *_vm;
         bool _loaded;
         int _numChars;
+        byte *_decodedData;
         struct {
                 int xoffs;
                 int yoffs;