diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-01 00:30:50 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-01 00:30:50 +0000 |
| commit | f438b6b2ed8fb3013ef75832ef0763d27aa130eb (patch) | |
| tree | 57dbdbd030a0efb418ff714992520fc23af4597a /src/live_effects | |
| parent | Update to trunk (diff) | |
| parent | partial 2geom update: (diff) | |
| download | inkscape-f438b6b2ed8fb3013ef75832ef0763d27aa130eb.tar.gz inkscape-f438b6b2ed8fb3013ef75832ef0763d27aa130eb.zip | |
Update to trunk
(bzr r13090.1.39)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/lpe-knot.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-rough-hatches.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp index e91677e18..581c632f5 100644 --- a/src/live_effects/lpe-knot.cpp +++ b/src/live_effects/lpe-knot.cpp @@ -493,7 +493,7 @@ LPEKnot::doEffect_path (std::vector<Geom::Path> const &path_in) } } for (unsigned comp = beg_comp; comp < end_comp; comp++){ - assert(dom.at(comp).min() >=0 and dom.at(comp).max() <= size_nondegenerate(gpaths.at(i0))); + assert(dom.at(comp).min() >=0 && dom.at(comp).max() <= size_nondegenerate(gpaths.at(i0))); path_out.push_back(gpaths[i0].portion(dom.at(comp))); } } diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp index 6ffb913bd..455653e46 100644 --- a/src/live_effects/lpe-rough-hatches.cpp +++ b/src/live_effects/lpe-rough-hatches.cpp @@ -319,7 +319,7 @@ LPERoughHatches::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & transformed_pwd2_in = transformed_pwd2_in * bend_mat; tilter = Piecewise<SBasis>(shift(Linear(-bend_amount),1)); OptRect bbox = bounds_exact( transformed_pwd2_in ); - if (not(bbox)) return pwd2_in; + if (!(bbox)) return pwd2_in; tilter.setDomain((*bbox)[Y]); transformed_pwd2_in = bend(transformed_pwd2_in, tilter); transformed_pwd2_in = transformed_pwd2_in * bend_mat.inverse(); @@ -381,7 +381,7 @@ LPERoughHatches::linearSnake(Piecewise<D2<SBasis> > const &f, Point const &org){ Piecewise<SBasis> dx = derivative(x); OptInterval range = bounds_exact(x); - if (not range) return result; + if (!range) return result; std::vector<double> levels = generateLevels(*range, org[X]); std::vector<std::vector<double> > times; times = multi_roots(x,levels); |