libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 18:06:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DIRECTOR: Properly process external bitmaps in MacBinary format

Browse Source
This commit is contained in:
Eugene Sandulenko 2023-02-24 19:38:29 +01:00
parent d12e5daf68
commit c22a9f7bd4
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/director/cast.cpp
View File

@ -21,6 +21,7 @@
#include "common/config-manager.h"
#include "common/file.h"
#include "common/macresman.h"
#include "common/memstream.h"
#include "common/substream.h"
@ -674,8 +675,6 @@ void Cast::loadBitmapData(int key, BitmapCastMember *bitmapCast) {
if ((pic == nullptr || pic->size() == 0)
&& _castsInfo.contains(key) && !_castsInfo[key]->fileName.empty()) {
// image file is linked, load from the filesystem
Common::File file;
Common::String filename = _castsInfo[key]->fileName;
Common::String directory = _castsInfo[key]->directory;
@ -683,11 +682,12 @@ void Cast::loadBitmapData(int key, BitmapCastMember *bitmapCast) {
Common::Path path = Common::Path(pathMakeRelative(imageFilename), g_director->_dirSeparator);
if (file.open(path)) {
Common::SeekableReadStream *file = Common::MacResManager::openFileOrDataFork(path);
if (file) {
Image::PICTDecoder *pict = new Image::PICTDecoder();
bool res = pict->loadStream(file);
file.close();
bool res = pict->loadStream(*file);
delete file;
if (res) {
bitmapCast->_img = pict;