thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed ImageMan again, now the code uses Graphics::ImageDecoder directly.

Browse source 
svn-id: r35960
This commit is contained in:
Johannes Schickel 2009-01-20 18:31:35 +00:00
parent 496ab478a2
commit 4c62af49c2
5 changed files with 28 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

25
backends/vkeybd/virtual-keyboard-parser.cpp
View file

@ -31,7 +31,9 @@
#include "common/keyboard.h"
#include "common/util.h"
#include "common/system.h"
#include "backends/vkeybd/imageman.h"
#include "common/archive.h"
#include "graphics/imagedec.h"
namespace Common {
@ -150,8 +152,8 @@ bool VirtualKeyboardParser::parserCallback_mode(ParserNode *node) {
return true;
} else {
// remove data relating to old resolution
ImageMan.unregisterSurface(_mode->bitmapName);
_mode->bitmapName.clear();
delete _mode->image;
_mode->image = 0;
_mode->imageMap.removeAllAreas();
delete _mode->displayArea;
@ -249,16 +251,17 @@ bool VirtualKeyboardParser::parserCallback_layout(ParserNode *node) {
}
_mode->bitmapName = node->values["bitmap"];
_mode->image = ImageMan.getSurface(_mode->bitmapName);
if (!_mode->image) {
if (!ImageMan.registerSurface(_mode->bitmapName, 0))
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
_mode->image = ImageMan.getSurface(_mode->bitmapName);
if (!_mode->image)
return parserError("Error loading bitmap '%s'", _mode->bitmapName.c_str());
}
SeekableReadStream *file = _keyboard->_fileArchive->openFile(_mode->bitmapName);
if (!file)
return parserError("Bitmap '%s' not found", _mode->bitmapName.c_str());
_mode->image = Graphics::ImageDecoder::loadFile(*file);
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")) {