summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-05-25 14:06:41 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-05-25 14:06:41 +0000
commit3f1ed1e2a4eda86fb6d7a310dc3111da99db5f4d (patch)
treea2c70c2ff19cb59f89d24606fa43f9b0ed433d0d
parentRemoved g_free() calls that now refer to static strings (diff)
downloadinkscape-3f1ed1e2a4eda86fb6d7a310dc3111da99db5f4d.tar.gz
inkscape-3f1ed1e2a4eda86fb6d7a310dc3111da99db5f4d.zip
Fix some compile warnings
(bzr r5752)
-rw-r--r--src/live_effects/lpe-patternalongpath.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 9ab085d54..85de609fb 100644
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -144,7 +144,7 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
double scaling = 1;
switch(type) {
case PAPCT_REPEATED:
- nbCopies = floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace));
+ nbCopies = static_cast<int>(floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace)));
pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace);
break;
@@ -160,12 +160,12 @@ LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > con
case PAPCT_REPEATED_STRETCHED:
// if uskeleton is closed:
if(path_i.segs.front().at0() == path_i.segs.back().at1()){
- nbCopies = std::floor((uskeleton.domain().extent() - toffset)/(pattBndsX.extent()+xspace));
+ nbCopies = static_cast<int>(std::floor((uskeleton.domain().extent() - toffset)/(pattBndsX.extent()+xspace)));
pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace);
scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX.extent());
// if not closed: no space at the end
}else{
- nbCopies = std::floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace));
+ nbCopies = static_cast<int>(std::floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace)));
pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace);
scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX.extent() - xspace);
}