X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_surface.h;h=58a3efa5d2a0b72982084520f477894179682c6f;hb=279e1511f5e112e9aed6b01499c4a05fee76286e;hp=ae50b1e6e75fe408cb30c24dfc4bb7fea07907ed;hpb=b3016b249333ac0ab0008d8c6c4d9029b2ff30c9;p=synfig.git

diff --git a/ETL/trunk/ETL/_surface.h b/ETL/trunk/ETL/_surface.h
index ae50b1e..58a3efa 100644
--- a/ETL/trunk/ETL/_surface.h
+++ b/ETL/trunk/ETL/_surface.h
@@ -31,7 +31,7 @@
 
 #include "_pen.h"
 #include "_misc.h"
-//#include <algorithm>
+#include <algorithm>
 
 /* === M A C R O S ========================================================= */
 
@@ -274,8 +274,8 @@ public:
 		}
 				
 		//clip width against dest width
-		w = std::min(w,DEST_PEN.end_x()-DEST_PEN.x());
-		h = std::min(h,DEST_PEN.end_y()-DEST_PEN.y());
+		w = std::min((long)w,(long)(DEST_PEN.end_x()-DEST_PEN.x()));
+		h = std::min((long)h,(long)(DEST_PEN.end_y()-DEST_PEN.y()));
 		
 		//clip width against src width
 		w = std::min(w,w_-x);