projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1349630: Fix synfig side of amd64 FTBFS
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
surface.cpp
diff --git
a/synfig-core/trunk/src/synfig/surface.cpp
b/synfig-core/trunk/src/synfig/surface.cpp
index
be287c8
..
50a039a
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
}
//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
//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;
if(w<=0 || h<=0)
return;