[Scummvm-git-logs] scummvm master -> 878b79a149397b8baf6cdba3e118b69f92ad7674

sev- noreply at scummvm.org
Fri Sep 23 22:42:54 UTC 2022


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:
878b79a149 VIDEO: Fix compilation without freetype2


Commit: 878b79a149397b8baf6cdba3e118b69f92ad7674
    https://github.com/scummvm/scummvm/commit/878b79a149397b8baf6cdba3e118b69f92ad7674
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-09-24T00:42:28+02:00

Commit Message:
VIDEO: Fix compilation without freetype2

Changed paths:
    video/subtitles.cpp


diff --git a/video/subtitles.cpp b/video/subtitles.cpp
index ace0284bd0c..467d7b5a120 100644
--- a/video/subtitles.cpp
+++ b/video/subtitles.cpp
@@ -240,9 +240,11 @@ void Subtitles::setFont(const char *fontname, int height) {
 
 	_fontHeight = height;
 
+#ifdef USE_FREETYPE2
 	if (file.open(fontname)) {
 		_font = Graphics::loadTTFFont(file, _fontHeight, Graphics::kTTFSizeModeCharacter, 96);
 	}
+#endif
 
 	if (!_font) {
 		warning("Cannot load font %s directly", fontname);




More information about the Scummvm-git-logs mailing list