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

CLOUD: Do not error out when loading icon if OSD format is not 2 or 4 Bpp

Browse source 
Graphics::TransparentSurface::convertTo() errors out when the destination
format is not 2 or 4 Bpp. But in the case of the cloud icon we can recover
from it. So just print a warning and don't close the application.
This commit is contained in:
Thierry Crozat 2016-09-05 21:59:34 +01:00
parent bd66e005c2
commit d853240eee
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/networking/curl/cloudicon.cpp
View file

@ -122,7 +122,11 @@ void CloudIcon::loadIcon(Graphics::TransparentSurface &icon, byte *data, uint32
if (s) {
Graphics::PixelFormat f = g_system->getOSDFormat();
if (f != s->format) {
Graphics::TransparentSurface *s2 = s->convertTo(f);
// Graphics::TransparentSurface::convertTo(f) errors out if the format is not 2Bpp or 4Bpp.
// We don't need to error out as we can recover from it. So check the format before calling convertTo(f);
Graphics::TransparentSurface *s2 = nullptr;
if (f.bytesPerPixel == 2 || f.bytesPerPixel == 4)
s2 = s->convertTo(f);
if (s2)
icon.copyFrom(*s2);
else