[Scummvm-git-logs] scummvm master -> 3989d2652b54760c4fc7edf89f8db8b716ee6208

[dreammaster]

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:
3989d2652b AGS: Compilation fix


Commit: 3989d2652b54760c4fc7edf89f8db8b716ee6208
    https://github.com/scummvm/scummvm/commit/3989d2652b54760c4fc7edf89f8db8b716ee6208
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-28T22:45:52-07:00

Commit Message:
AGS: Compilation fix

Changed paths:
    engines/ags/lib/alfont/alfont.cpp
    graphics/fonts/freetype.cpp


diff --git a/engines/ags/lib/alfont/alfont.cpp b/engines/ags/lib/alfont/alfont.cpp
index 2efb425df3c..a73747398dc 100644
--- a/engines/ags/lib/alfont/alfont.cpp
+++ b/engines/ags/lib/alfont/alfont.cpp
@@ -24,6 +24,7 @@
 
 #ifdef USE_FREETYPE2
 
+#include <wchar.h>
 #include "ags/lib/alfont/alfont.h"
 #include "ags/lib/allegro/color.h"
 #include "ags/lib/allegro/draw.h"
@@ -425,7 +426,7 @@ int alfont_set_font_size(ALFONT_FONT *f, int h) {
 
 int alfont_set_font_size_ex(ALFONT_FONT *f, int h, int flags) {
 	int error, test_h, direction;
-	int real_height;
+	int real_height = 0;
 	/* check the font doesn't already use that w and h */
 	if ((h == f->face_h) && (flags & ALFONT_FLG_FORCE_RESIZE) == 0)
 		return ALFONT_OK;
diff --git a/graphics/fonts/freetype.cpp b/graphics/fonts/freetype.cpp
index 38bbe286c95..1a3cf2e951c 100644
--- a/graphics/fonts/freetype.cpp
+++ b/graphics/fonts/freetype.cpp
@@ -26,7 +26,6 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "common/scummsys.h"
-#include <wchar.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H