[Scummvm-cvs-logs] scummvm branch-1-8 -> f80f729ecea1a567da21130f88c29c049fc0760a

sev- sev at scummvm.org
Mon Mar 28 20:48:23 CEST 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
175b690d84 COMMON: Use better reallocation strategy in MemoryWriteStreamDynamic.
f80f729ece NEWS: Mention bs2.5 fix


Commit: 175b690d84df7a9f9249984f86e95c85e399792d
    https://github.com/scummvm/scummvm/commit/175b690d84df7a9f9249984f86e95c85e399792d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-28T20:47:00+02:00

Commit Message:
COMMON: Use better reallocation strategy in MemoryWriteStreamDynamic.

Fixes bug #6983: "SWORD25: long saving time"

Changed paths:
    common/memstream.h



diff --git a/common/memstream.h b/common/memstream.h
index 5ecc553..a01973c 100644
--- a/common/memstream.h
+++ b/common/memstream.h
@@ -25,6 +25,7 @@
 
 #include "common/stream.h"
 #include "common/types.h"
+#include "common/util.h"
 
 namespace Common {
 
@@ -170,7 +171,7 @@ private:
 
 		byte *old_data = _data;
 
-		_capacity = new_len + 32;
+		_capacity = MAX(new_len + 32, _capacity * 2);
 		_data = (byte *)malloc(_capacity);
 		_ptr = _data + _pos;
 


Commit: f80f729ecea1a567da21130f88c29c049fc0760a
    https://github.com/scummvm/scummvm/commit/f80f729ecea1a567da21130f88c29c049fc0760a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-28T20:47:31+02:00

Commit Message:
NEWS: Mention bs2.5 fix

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index 66f5bc9..ecf05d3 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fixed resource releasing on game exit.
    - Fixed game restart after language change in-game.
    - Fixed flickering in main Menu.
+   - Fixed long save time on Windows.
 
  Windows port:
    - Fixed bug in MIDI device listing affecting cases where MIDI devices were






More information about the Scummvm-git-logs mailing list