aboutsummaryrefslogtreecommitdiff
path: root/backends/vkeybd
diff options
context:
space:
mode:
authorMax Horn2009-01-23 23:50:54 +0000
committerMax Horn2009-01-23 23:50:54 +0000
commit5556fc7f72856fde1746c89792d97bd826da33a2 (patch)
treee47901665a0e52b5e3d3d5613968fd3a6033039b /backends/vkeybd
parent4d5702606f7eb4c62ee07587724c1f21873bc096 (diff)
downloadscummvm-rg350-5556fc7f72856fde1746c89792d97bd826da33a2.tar.gz
scummvm-rg350-5556fc7f72856fde1746c89792d97bd826da33a2.tar.bz2
scummvm-rg350-5556fc7f72856fde1746c89792d97bd826da33a2.zip
Changed Graphics::ImageDecoder to allow custom PixelFormats
svn-id: r36026
Diffstat (limited to 'backends/vkeybd')
-rw-r--r--backends/vkeybd/virtual-keyboard-parser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/backends/vkeybd/virtual-keyboard-parser.cpp b/backends/vkeybd/virtual-keyboard-parser.cpp
index 7034d90a30..73575d0d9a 100644
--- a/backends/vkeybd/virtual-keyboard-parser.cpp
+++ b/backends/vkeybd/virtual-keyboard-parser.cpp
@@ -256,13 +256,14 @@ bool VirtualKeyboardParser::parserCallback_layout(ParserNode *node) {
if (!file)
return parserError("Bitmap '%s' not found", _mode->bitmapName.c_str());
- _mode->image = Graphics::ImageDecoder::loadFile(*file);
+ const Graphics::PixelFormat format = g_system->getOverlayFormat();
+
+ _mode->image = Graphics::ImageDecoder::loadFile(*file, format);
delete file;
if (!_mode->image)
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
- const Graphics::PixelFormat format = g_system->getOverlayFormat();
int r, g, b;
if (node->values.contains("transparent_color")) {
if (!parseIntegerKey(node->values["transparent_color"].c_str(), 3, &r, &g, &b))