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

[dwatteau]

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

Summary:
ed9399f157 VIDEO: Fix warning when building without freetype2


Commit: ed9399f157d58a56ffa6c0caa37fb4f2f0732c8b
    https://github.com/scummvm/scummvm/commit/ed9399f157d58a56ffa6c0caa37fb4f2f0732c8b
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-03T15:29:53+02:00

Commit Message:
VIDEO: Fix warning when building without freetype2

Changed paths:
    video/subtitles.cpp


diff --git a/video/subtitles.cpp b/video/subtitles.cpp
index 37b6077eccf..116f8b4b43a 100644
--- a/video/subtitles.cpp
+++ b/video/subtitles.cpp
@@ -302,10 +302,10 @@ Subtitles::~Subtitles() {
 }
 
 void Subtitles::setFont(const char *fontname, int height, Common::String type) {
-	Graphics::Font *font = nullptr;
 	_fontHeight = height;
 
 #ifdef USE_FREETYPE2
+	Graphics::Font *font = nullptr;
 	Common::File *file = new Common::File();
 	if (file->open(fontname)) {
 		font = Graphics::loadTTFFont(file, DisposeAfterUse::YES, _fontHeight, Graphics::kTTFSizeModeCharacter, 96);