summaryrefslogtreecommitdiffstats
path: root/src/live_effects/lpe-perspective-envelope.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2019-01-02 09:41:30 +0000
commit169dff19d4da8d76e69b8e896aa25b0013639c03 (patch)
treea0c070fa95188b5cde708ac285e6a2db9df4a83f /src/live_effects/lpe-perspective-envelope.cpp
parentAvoid creating a new document before opening an old document. (diff)
downloadinkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.tar.gz
inkscape-169dff19d4da8d76e69b8e896aa25b0013639c03.zip
modernize loops
Diffstat (limited to 'src/live_effects/lpe-perspective-envelope.cpp')
-rw-r--r--src/live_effects/lpe-perspective-envelope.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp
index b0ca8e521..6d0cd707f 100644
--- a/src/live_effects/lpe-perspective-envelope.cpp
+++ b/src/live_effects/lpe-perspective-envelope.cpp
@@ -204,9 +204,9 @@ void LPEPerspectiveEnvelope::doEffect(SPCurve *curve)
free_term[i+4] = handles[i][Y];
}
int h = 0;
- for( int i = 0; i < 8; i++ ) {
+ for(auto & i : solmatrix) {
for( int j = 0; j < 8; j++ ) {
- gslSolmatrix[h] = solmatrix[i][j];
+ gslSolmatrix[h] = i[j];
h++;
}
}
@@ -220,13 +220,13 @@ void LPEPerspectiveEnvelope::doEffect(SPCurve *curve)
gsl_linalg_LU_decomp (&m.matrix, p, &s);
gsl_linalg_LU_solve (&m.matrix, p, &b.vector, x);
h = 0;
- for( int i = 0; i < 3; i++ ) {
+ for(auto & i : projmatrix) {
for( int j = 0; j < 3; j++ ) {
if(h==8) {
projmatrix[2][2] = 1.0;
continue;
}
- projmatrix[i][j] = gsl_vector_get(x, h);
+ i[j] = gsl_vector_get(x, h);
h++;
}
}
@@ -239,21 +239,21 @@ void LPEPerspectiveEnvelope::doEffect(SPCurve *curve)
Geom::Point point_at1(0, 0);
Geom::Point point_at2(0, 0);
Geom::Point point_at3(0, 0);
- for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) {
+ for (const auto & path_it : original_pathv) {
//Si está vacío...
- if (path_it->empty())
+ if (path_it.empty())
continue;
//Itreadores
SPCurve *nCurve = new SPCurve();
- Geom::Path::const_iterator curve_it1 = path_it->begin();
- Geom::Path::const_iterator curve_it2 = ++(path_it->begin());
- Geom::Path::const_iterator curve_endit = path_it->end_default();
+ Geom::Path::const_iterator curve_it1 = path_it.begin();
+ Geom::Path::const_iterator curve_it2 = ++(path_it.begin());
+ Geom::Path::const_iterator curve_endit = path_it.end_default();
- if (path_it->closed()) {
+ if (path_it.closed()) {
const Geom::Curve &closingline =
- path_it->back_closed();
+ path_it.back_closed();
if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
- curve_endit = path_it->end_open();
+ curve_endit = path_it.end_open();
}
}
if(deform_type == DEFORMATION_PERSPECTIVE) {
@@ -287,7 +287,7 @@ void LPEPerspectiveEnvelope::doEffect(SPCurve *curve)
}
}
//y cerramos la curva
- if (path_it->closed()) {
+ if (path_it.closed()) {
nCurve->move_endpoints(point_at3, point_at3);
nCurve->closepath_current();
}