[Scummvm-git-logs] scummvm master -> e74f2257316d7accce92871c7ded9fffa26cade1

[digitall]

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

Summary:
e74f225731 GRAPHICS: Fix Compilation Breakage from Merge of Korean Font Code


Commit: e74f2257316d7accce92871c7ded9fffa26cade1
    https://github.com/scummvm/scummvm/commit/e74f2257316d7accce92871c7ded9fffa26cade1
Author: D G Turner (digitall at scummvm.org)
Date: 2020-11-09T07:40:40Z

Commit Message:
GRAPHICS: Fix Compilation Breakage from Merge of Korean Font Code

This breaks compilation on several platforms due to the initialization
in the header. This is replaced by adding a constructor / destructor
instead as per the other class, which also will aid future development
of this code.

Changed paths:
    graphics/korfont.cpp
    graphics/korfont.h


diff --git a/graphics/korfont.cpp b/graphics/korfont.cpp
index ecbcfce4bf..055b3bce9a 100644
--- a/graphics/korfont.cpp
+++ b/graphics/korfont.cpp
@@ -527,6 +527,17 @@ const uint8 *FontKoreanSVM::getCharDataDefault(uint16 c) const {
 
 // Korean Wansung font
 
+FontKoreanWansung::FontKoreanWansung()
+	: _fontShadow(0), _fontData(0), _fontDataSize(0),
+	  _englishFontWidth(0), _englishFontHeight(0), _englishFontData(0),
+	  _englishFontDataSize(0) {
+}
+
+FontKoreanWansung::~FontKoreanWansung() {
+	delete[] _fontData;
+	delete[] _englishFontData;
+}
+
 bool FontKoreanWansung::loadData(const char *fontFile) {
 	Common::SeekableReadStream *data = SearchMan.createReadStreamForMember(fontFile);
 	if (!data)
diff --git a/graphics/korfont.h b/graphics/korfont.h
index 091c71a5e4..fc815df064 100644
--- a/graphics/korfont.h
+++ b/graphics/korfont.h
@@ -191,6 +191,8 @@ private:
  */
 class FontKoreanWansung : public FontKoreanBase {
 public:
+	FontKoreanWansung();
+	~FontKoreanWansung();
 	/**
 	 * Loads the ROM data from "KOREAN#.FNT".
 	 */
@@ -207,7 +209,7 @@ private:
 
 	int _englishFontWidth;
 	int _englishFontHeight;
-	uint8 *_englishFontData = NULL;
+	uint8 *_englishFontData;
 	uint _englishFontDataSize;