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

[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:
9a787fa586 GRAPHICS: Silence conversion warnings by using an explicit cast.
ff451ba2dc GRAPHICS: Slight formatting fixes in thumbnail_intern.cpp.


Commit: 9a787fa5861061580711073d5e2403d54887a421
    https://github.com/scummvm/scummvm/commit/9a787fa5861061580711073d5e2403d54887a421
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-08-02T08:33:13-07:00

Commit Message:
GRAPHICS: Silence conversion warnings by using an explicit cast.

Changed paths:
    graphics/scaler/thumbnail_intern.cpp



diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp
index 2756e40..d51eff5 100644
--- a/graphics/scaler/thumbnail_intern.cpp
+++ b/graphics/scaler/thumbnail_intern.cpp
@@ -145,9 +145,9 @@ static void scaleThumbnail(Graphics::Surface &in, Graphics::Surface &out) {
 				const float xDiff = xFrac - x1;
 				const float yDiff = yFrac - y1;
 
-				uint8 pR = ((1 - yDiff) * ((1 - xDiff) * p1R + xDiff * p2R) + yDiff * ((1 - xDiff) * p3R + xDiff * p4R));
-				uint8 pG = ((1 - yDiff) * ((1 - xDiff) * p1G + xDiff * p2G) + yDiff * ((1 - xDiff) * p3G + xDiff * p4G));
-				uint8 pB = ((1 - yDiff) * ((1 - xDiff) * p1B + xDiff * p2B) + yDiff * ((1 - xDiff) * p3B + xDiff * p4B));
+				uint8 pR = (uint8)((1 - yDiff) * ((1 - xDiff) * p1R + xDiff * p2R) + yDiff * ((1 - xDiff) * p3R + xDiff * p4R));
+				uint8 pG = (uint8)((1 - yDiff) * ((1 - xDiff) * p1G + xDiff * p2G) + yDiff * ((1 - xDiff) * p3G + xDiff * p4G));
+				uint8 pB = (uint8)((1 - yDiff) * ((1 - xDiff) * p1B + xDiff * p2B) + yDiff * ((1 - xDiff) * p3B + xDiff * p4B));
 
 
 				WRITE_UINT16(dst, Graphics::RGBToColor<Graphics::ColorMasks<565> >(pR, pG, pB));


Commit: ff451ba2dc8c417d781f362f4af80aec44b57341
    https://github.com/scummvm/scummvm/commit/ff451ba2dc8c417d781f362f4af80aec44b57341
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-08-02T08:48:31-07:00

Commit Message:
GRAPHICS: Slight formatting fixes in thumbnail_intern.cpp.

Changed paths:
    graphics/scaler/thumbnail_intern.cpp



diff --git a/graphics/scaler/thumbnail_intern.cpp b/graphics/scaler/thumbnail_intern.cpp
index d51eff5..347a25e 100644
--- a/graphics/scaler/thumbnail_intern.cpp
+++ b/graphics/scaler/thumbnail_intern.cpp
@@ -149,7 +149,6 @@ static void scaleThumbnail(Graphics::Surface &in, Graphics::Surface &out) {
 				uint8 pG = (uint8)((1 - yDiff) * ((1 - xDiff) * p1G + xDiff * p2G) + yDiff * ((1 - xDiff) * p3G + xDiff * p4G));
 				uint8 pB = (uint8)((1 - yDiff) * ((1 - xDiff) * p1B + xDiff * p2B) + yDiff * ((1 - xDiff) * p3B + xDiff * p4B));
 
-
 				WRITE_UINT16(dst, Graphics::RGBToColor<Graphics::ColorMasks<565> >(pR, pG, pB));
 				dst += 2;
 			}
@@ -165,7 +164,7 @@ static void scaleThumbnail(Graphics::Surface &in, Graphics::Surface &out) {
  * Copies the current screen contents to a new surface, using RGB565 format.
  * WARNING: surf->free() must be called by the user to avoid leaking.
  *
- * @param surf		the surface to store the data in it
+ * @param surf      the surface to store the data in it
  */
 static bool grabScreen565(Graphics::Surface *surf) {
 	Graphics::Surface *screen = g_system->lockScreen();