[Scummvm-cvs-logs] scummvm master -> bb7e95f1ad7f432fd2daa90200f750b37c5c6c2e

[lordhoto]

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

Summary:
a2a5d42a58 GRAPHICS: Fix warnings about mismatching format arguments.
bb7e95f1ad I18N: Update po/POTFILES for bada => tizen change.


Commit: a2a5d42a585f6baba1677b29655e55b7cde39a73
    https://github.com/scummvm/scummvm/commit/a2a5d42a585f6baba1677b29655e55b7cde39a73
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-08-12T07:43:35-07:00

Commit Message:
GRAPHICS: Fix warnings about mismatching format arguments.

Changed paths:
    graphics/VectorRendererSpec.cpp



diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index 1e01744..e4843ba 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -588,7 +588,7 @@ blendPixelPtr(PixelType *ptr, PixelType color, uint8 alpha) {
 			(int)(idst & _blueMask)) * alpha) >> 8))) |
 			(idst & _alphaMask));
 	} else {
-		error("Unsupported BPP format: %d", sizeof(PixelType));
+		error("Unsupported BPP format: %u", (uint)sizeof(PixelType));
 	}
 }
 


Commit: bb7e95f1ad7f432fd2daa90200f750b37c5c6c2e
    https://github.com/scummvm/scummvm/commit/bb7e95f1ad7f432fd2daa90200f750b37c5c6c2e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-08-12T07:44:35-07:00

Commit Message:
I18N: Update po/POTFILES for bada => tizen change.

Changed paths:
    po/POTFILES



diff --git a/po/POTFILES b/po/POTFILES
index b812620..869323b 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -99,5 +99,5 @@ backends/events/default/default-events.cpp
 backends/events/gph/gph-events.cpp
 backends/events/openpandora/op-events.cpp
 backends/updates/macosx/macosx-updates.mm
-backends/platform/bada/form.cpp
+backends/platform/tizen/form.cpp
 backends/events/maemosdl/maemosdl-events.cpp