From: pabs <pabs@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sun, 26 Mar 2006 07:09:49 +0000 (+0000)
Subject: Fix 1349630: Fix synfig side of amd64 FTBFS
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ff51c611cec8d1f2096499ef98bf9600d2206898;p=synfig.git

Fix 1349630: Fix synfig side of amd64 FTBFS


git-svn-id: http://svn.voria.com/code@155 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp
index be287c8..50a039a 100644
--- a/synfig-core/trunk/src/synfig/surface.cpp
+++ b/synfig-core/trunk/src/synfig/surface.cpp
@@ -158,12 +158,12 @@ synfig::Surface::blit_to(alpha_pen& pen, int x, int y, int w, int h)
 		}
 				
 		//clip width against dest width
-		w = min(w,pen.end_x()-pen.x());
-		h = min(h,pen.end_y()-pen.y());
+		w = min(w,(int)(pen.end_x()-pen.x()));
+		h = min(h,(int)(pen.end_y()-pen.y()));
 		
 		//clip width against src width
-		w = min(w,get_w()-x);		
-		h = min(h,get_h()-y);	
+		w = min(w,(int)(get_w()-x));
+		h = min(h,(int)(get_h()-y));
 
 		if(w<=0 || h<=0)
 			return;