diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-08 18:30:03 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-08 18:30:03 +0000 |
| commit | 0d65a6366721c314ca82e2600b7a2778e42bfdca (patch) | |
| tree | d432377950a04fddd169c0b5bb8517345f9cee3e /src/live_effects | |
| parent | Keep selection (diff) | |
| parent | merge trunk-refactoring (diff) | |
| download | inkscape-0d65a6366721c314ca82e2600b7a2778e42bfdca.tar.gz inkscape-0d65a6366721c314ca82e2600b7a2778e42bfdca.zip | |
Update to trunk
(bzr r15142.1.6)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/lpe-envelope.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp index 0ce784877..c3b0a7c10 100644 --- a/src/live_effects/lpe-envelope.cpp +++ b/src/live_effects/lpe-envelope.cpp @@ -47,7 +47,7 @@ Geom::Piecewise<Geom::D2<Geom::SBasis> > LPEEnvelope::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) { - if(xx.get_value() == false && yy.get_value() == false) + if(!xx.get_value() && !yy.get_value()) { return pwd2_in; } @@ -158,7 +158,7 @@ LPEEnvelope::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd output_y = ybis*(compose((uskeleton1),x1) + y1*compose(n1,x1) ) + y*(compose((uskeleton3),x3) + y3*compose(n3,x3) ); output_y /= (boundingbox_Y.extent()); - if(xx.get_value() == false && yy.get_value() == true) + if(!xx.get_value() && yy.get_value()) { return output_y; } @@ -167,13 +167,13 @@ LPEEnvelope::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd output_x = x*(compose((uskeleton2),y2) + -x2*compose(n2,y2) ) + xbis*(compose((uskeleton4),y4) + -x4*compose(n4,y4) ); output_x /= (boundingbox_X.extent()); - if(xx.get_value() == true && yy.get_value() == false) + if(xx.get_value() && !yy.get_value()) { return output_x; } /*output : Deformation by Up, Left, Right and Down Bend Paths*/ - if(xx.get_value() == true && yy.get_value() == true) + if(xx.get_value() && yy.get_value()) { Piecewise<SBasis> xsqr = x*xbis; /* xsqr = x * (BBox_X - x) */ Piecewise<SBasis> ysqr = y*ybis; /* xsqr = y * (BBox_Y - y) */ |