[Scummvm-git-logs] scummvm master -> d853240eeea01cae0ae95be85a467b34054eca13

criezy criezy at scummvm.org
Mon Sep 5 23:00:27 CEST 2016


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
01cb03c4be I18N: Update French translation
bd66e005c2 I18N: Regenerate translations data file
d853240eee CLOUD: Do not error out when loading icon if OSD format is not 2 or 4 Bpp


Commit: 01cb03c4be58b588602833f8ba3396da1912d6d6
    https://github.com/scummvm/scummvm/commit/01cb03c4be58b588602833f8ba3396da1912d6d6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T21:41:51+01:00

Commit Message:
I18N: Update French translation

Changed paths:
    po/fr_FR.po



diff --git a/po/fr_FR.po b/po/fr_FR.po
index 82858c7..e0ce85c 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: ScummVM 1.8.0git\n"
 "Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
 "POT-Creation-Date: 2016-09-05 10:12+0200\n"
-"PO-Revision-Date: 2016-09-05 00:40+0100\n"
+"PO-Revision-Date: 2016-09-05 21:34+0100\n"
 "Last-Translator: Thierry Crozat <criezy at scummvm.org>\n"
 "Language-Team: French <scummvm-devel at lists.sf.net>\n"
-"Language: fr_FR\n"
+"Language: Francais\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -94,7 +94,7 @@ msgstr "Vers : "
 
 #: gui/downloaddialog.cpp:63
 msgid "Cancel download"
-msgstr "Annuler le téléchargement"
+msgstr "Annuler"
 
 #: gui/downloaddialog.cpp:65
 msgctxt "lowres"
@@ -184,9 +184,9 @@ msgid "Downloaded %s %s / %s %s"
 msgstr "Téléchargé %s %s / %s %s"
 
 #: gui/downloaddialog.cpp:258
-#, fuzzy, c-format
+#, c-format
 msgid "Download speed: %s %s"
-msgstr "Téléchargé %s %s / %s %s"
+msgstr "Vitesse de téléchargement : %s %s"
 
 #: gui/editgamedialog.cpp:132
 msgid "Game"


Commit: bd66e005c23b2bf26c7c78a1ed1f26e911b6e6c0
    https://github.com/scummvm/scummvm/commit/bd66e005c23b2bf26c7c78a1ed1f26e911b6e6c0
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T21:42:09+01:00

Commit Message:
I18N: Regenerate translations data file

Changed paths:
    gui/themes/translations.dat



diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 985679b..8ae5262 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ


Commit: d853240eeea01cae0ae95be85a467b34054eca13
    https://github.com/scummvm/scummvm/commit/d853240eeea01cae0ae95be85a467b34054eca13
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T21:59:34+01:00

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

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.

Changed paths:
    backends/networking/curl/cloudicon.cpp



diff --git a/backends/networking/curl/cloudicon.cpp b/backends/networking/curl/cloudicon.cpp
index fd587f9..3ae6fd2 100644
--- a/backends/networking/curl/cloudicon.cpp
+++ b/backends/networking/curl/cloudicon.cpp
@@ -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





More information about the Scummvm-git-logs mailing list