[Scummvm-cvs-logs] SF.net SVN: scummvm:[53338] scummvm/trunk/engines/sword25

[sev at users.sourceforge.net]

Revision: 53338
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53338&view=rev
Author:   sev
Date:     2010-10-12 23:44:14 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Fix some warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
    scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
    scummvm/trunk/engines/sword25/gfx/image/art.cpp
    scummvm/trunk/engines/sword25/gfx/image/art_svp_render_aa.cpp

Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp	2010-10-12 23:43:44 UTC (rev 53337)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp	2010-10-12 23:44:14 UTC (rev 53338)
@@ -78,7 +78,7 @@
 	float screenToVideoHeight = (float)pGfx->GetDisplayHeight() / (float)_outputBitmap->getHeight();
 	float scaleFactor = MIN(screenToVideoWidth, screenToVideoHeight);
 
-	if (abs(scaleFactor - 1.0f) < FLT_EPSILON)
+	if (abs((int)(scaleFactor - 1.0f)) < FLT_EPSILON)
 		scaleFactor = 1.0f;
 
 	_outputBitmap->setScaleFactor(scaleFactor);

Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp	2010-10-12 23:43:44 UTC (rev 53337)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp	2010-10-12 23:44:14 UTC (rev 53338)
@@ -107,7 +107,7 @@
 
 // -----------------------------------------------------------------------------
 
-AnimationTemplate::AnimationTemplate(const AnimationTemplate &Other) {
+AnimationTemplate::AnimationTemplate(const AnimationTemplate &Other) : AnimationDescription(){
 	// Objekt registrieren.
 	AnimationTemplateRegistry::GetInstance().RegisterObject(this);
 

Modified: scummvm/trunk/engines/sword25/gfx/image/art.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/art.cpp	2010-10-12 23:43:44 UTC (rev 53337)
+++ scummvm/trunk/engines/sword25/gfx/image/art.cpp	2010-10-12 23:44:14 UTC (rev 53338)
@@ -90,8 +90,8 @@
  **/
 int
 art_svp_seg_compare(const void *s1, const void *s2) {
-	const ArtSVPSeg *seg1 = (ArtSVPSeg *)s1;
-	const ArtSVPSeg *seg2 = (ArtSVPSeg *)s2;
+	const ArtSVPSeg *seg1 = (const ArtSVPSeg *)s1;
+	const ArtSVPSeg *seg2 = (const ArtSVPSeg *)s2;
 
 	if (seg1->points[0].y - EPSILON > seg2->points[0].y) return 1;
 	else if (seg1->points[0].y + EPSILON < seg2->points[0].y) return -1;

Modified: scummvm/trunk/engines/sword25/gfx/image/art_svp_render_aa.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/art_svp_render_aa.cpp	2010-10-12 23:43:44 UTC (rev 53337)
+++ scummvm/trunk/engines/sword25/gfx/image/art_svp_render_aa.cpp	2010-10-12 23:44:14 UTC (rev 53338)
@@ -259,13 +259,13 @@
 					x_min = x_bot;
 					x_max = x_top;
 				}
-				ix_min = floor(x_min);
-				ix_max = floor(x_max);
+				ix_min = (int)floor(x_min);
+				ix_max = (int)floor(x_max);
 				if (ix_min >= x1) {
 					/* skip; it starts to the right of the render region */
 				} else if (ix_max < x0)
 					/* it ends to the left of the render region */
-					start += delta;
+					start += (int)delta;
 				else if (ix_min == ix_max) {
 					/* case 1, antialias a single pixel */
 					xdelta = (ix_min + 1 - (x_min + x_max) * 0.5) * delta;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.