libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PEGASUS: Improve error messages when failing to load PICT images

Browse Source
This commit is contained in:
Matthew Hoops 2012-10-16 22:16:32 -04:00
parent c645f7dc93
commit dc3facfc62
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/pegasus/surface.cpp
View File

@ -85,7 +85,8 @@ void Surface::getImageFromPICTFile(const Common::String &fileName) {
if (!pict.open(fileName))
error("Could not open picture '%s'", fileName.c_str());
getImageFromPICTStream(&pict);
if (!getImageFromPICTStream(&pict))
error("Failed to load PICT '%s'", fileName.c_str());
}
void Surface::getImageFromPICTResource(Common::MacResManager *resFork, uint16 id) {
@ -93,19 +94,22 @@ void Surface::getImageFromPICTResource(Common::MacResManager *resFork, uint16 id
if (!res)
error("Could not open PICT resource %d from '%s'", id, resFork->getBaseFileName().c_str());
getImageFromPICTStream(res);
if (!getImageFromPICTStream(res))
error("Failed to load PICT resource %d from '%s'", id, resFork->getBaseFileName().c_str());
delete res;
}
void Surface::getImageFromPICTStream(Common::SeekableReadStream *stream) {
bool Surface::getImageFromPICTStream(Common::SeekableReadStream *stream) {
Graphics::PICTDecoder pict;
if (!pict.loadStream(*stream))
error("Failed to load PICT image");
return false;
_surface = pict.getSurface()->convertTo(g_system->getScreenFormat(), pict.getPalette());
_ownsSurface = true;
_bounds = Common::Rect(0, 0, _surface->w, _surface->h);
return true;
}
void Surface::getImageFromMovieFrame(Video::VideoDecoder *video, TimeValue time) {

2
engines/pegasus/surface.h
View File

@ -84,7 +84,7 @@ protected:
Common::Rect _bounds;
private:
void getImageFromPICTStream(Common::SeekableReadStream *stream);
bool getImageFromPICTStream(Common::SeekableReadStream *stream);
uint32 getGlowColor(uint32 color) const;
bool isTransparent(uint32 color) const;