[Scummvm-cvs-logs] scummvm master -> 4904554bb6ddd250de6bcb356b5660c9c57b5a2b

[somaen]

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:
3377784b35 WINTERMUTE: Add a warning when loading TTF-fonts without FreeType2-support.
4904554bb6 WINTERMUTE: Add a warning when trying to play video without Theoradec-support


Commit: 3377784b35c2da6634c76eaf3693b38554e05d5a
    https://github.com/scummvm/scummvm/commit/3377784b35c2da6634c76eaf3693b38554e05d5a
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2014-04-17T11:15:24+02:00

Commit Message:
WINTERMUTE: Add a warning when loading TTF-fonts without FreeType2-support.

Changed paths:
    engines/wintermute/base/font/base_font_truetype.cpp



diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index c5a1e91..df9a864 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -625,6 +625,8 @@ bool BaseFontTT::initFont() {
 		warning("Looking for %s", fontName.c_str());
 		_font = FontMan.getFontByName(fontName);
 	}
+#else
+	warning("BaseFontTT::InitFont - FreeType2-support not compiled in, TTF-fonts will not be loaded");
 #endif // USE_FREETYPE2
 
 	// Fallback4: Just use the Big GUI-font. (REALLY undesireable)


Commit: 4904554bb6ddd250de6bcb356b5660c9c57b5a2b
    https://github.com/scummvm/scummvm/commit/4904554bb6ddd250de6bcb356b5660c9c57b5a2b
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2014-04-17T11:21:33+02:00

Commit Message:
WINTERMUTE: Add a warning when trying to play video without Theoradec-support

Changed paths:
    engines/wintermute/video/video_theora_player.cpp



diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index b0c469c..e155358 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -127,6 +127,7 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 #if defined (USE_THEORADEC)
 	_theoraDecoder = new Video::TheoraDecoder();
 #else
+	warning("VideoTheoraPlayer::initialize - Theora support not compiled in, video will be skipped: %s", filename.c_str());
 	return STATUS_FAILED;
 #endif
 	_theoraDecoder->loadStream(_file);