Change to Andreas Jochens patch for Debian bugs #358474/#359690

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

diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp
index 50a039a..eb55068 100644 (file)
--- 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,(int)(pen.end_x()-pen.x()));
-               h = min(h,(int)(pen.end_y()-pen.y()));
+               w = min((long)w,(long)(pen.end_x()-pen.x()));
+               h = min((long)h,(long)(pen.end_y()-pen.y()));
                
                //clip width against src width
-               w = min(w,(int)(get_w()-x));
-               h = min(h,(int)(get_h()-y));
+               w = min(w,get_w()-x);
+               h = min(h,get_h()-y);
 
                if(w<=0 || h<=0)
                        return;