diff options
Diffstat (limited to 'src/trace')
| -rw-r--r-- | src/trace/imagemap.cpp | 4 | ||||
| -rw-r--r-- | src/trace/potrace/inkscape-potrace.cpp | 3 | ||||
| -rw-r--r-- | src/trace/quantize.cpp | 26 | ||||
| -rw-r--r-- | src/trace/trace.cpp | 3 |
4 files changed, 17 insertions, 19 deletions
diff --git a/src/trace/imagemap.cpp b/src/trace/imagemap.cpp index cd4690944..796575a44 100644 --- a/src/trace/imagemap.cpp +++ b/src/trace/imagemap.cpp @@ -442,8 +442,8 @@ IndexedMap *IndexedMapCreate(int width, int height) RGB rgb; rgb.r = rgb.g = rgb.b = 0; - for (int i=0; i<256 ; i++){ - me->clut[i] = rgb; + for (auto & i : me->clut){ + i = rgb; } return me; diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp index 4b50b1e1d..092fba634 100644 --- a/src/trace/potrace/inkscape-potrace.cpp +++ b/src/trace/potrace/inkscape-potrace.cpp @@ -119,9 +119,8 @@ struct Point */ static bool hasPoint(std::vector<Point> &points, double x, double y) { - for (unsigned int i=0; i<points.size() ; i++) + for (auto p : points) { - Point p = points[i]; if (p.x == x && p.y == y) return true; } diff --git a/src/trace/quantize.cpp b/src/trace/quantize.cpp index 6ba62eb88..93dbb3543 100644 --- a/src/trace/quantize.cpp +++ b/src/trace/quantize.cpp @@ -169,7 +169,7 @@ inline Ocnode *ocnodeNew(pool<Ocnode> *pool) node->ref = nullptr; node->parent = nullptr; node->nchild = 0; - for (int i = 0; i < 8; i++) node->child[i] = nullptr; + for (auto & i : node->child) i = nullptr; node->mi = 0; return node; } @@ -185,8 +185,8 @@ inline void ocnodeFree(pool<Ocnode> *pool, Ocnode *node) { static void octreeDelete(pool<Ocnode> *pool, Ocnode *node) { if (!node) return; - for (int i = 0; i < 8; i++) - octreeDelete(pool, node->child[i]); + for (auto & i : node->child) + octreeDelete(pool, i); ocnodeFree(pool, node); } @@ -375,16 +375,16 @@ static void ocnodeStrip(pool<Ocnode> *pool, Ocnode **ref, int *count, unsigned l node->nleaf = 0; node->mi = 0; Ocnode **lonelychild = nullptr; - for (int i = 0; i < 8; i++) if (node->child[i]) + for (auto & i : node->child) if (i) { - ocnodeStrip(pool, &node->child[i], count, lvl); - if (node->child[i]) + ocnodeStrip(pool, &i, count, lvl); + if (i) { - lonelychild = &node->child[i]; + lonelychild = &i; node->nchild++; - node->nleaf += node->child[i]->nleaf; - if (!node->mi || node->mi > node->child[i]->mi) - node->mi = node->child[i]->mi; + node->nleaf += i->nleaf; + if (!node->mi || node->mi > i->mi) + node->mi = i->mi; } } // tree adjustments @@ -501,9 +501,9 @@ static void octreeIndex(Ocnode *node, RGB *rgbpal, int *index) (*index)++; } else - for (int i = 0; i < 8; i++) - if (node->child[i]) - octreeIndex(node->child[i], rgbpal, index); + for (auto & i : node->child) + if (i) + octreeIndex(i, rgbpal, index); } /** diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 41380443c..9c4702fdc 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -510,9 +510,8 @@ void Tracer::traceThread() long totalNodeCount = 0L; - for (unsigned int i=0 ; i<results.size() ; i++) + for (auto result : results) { - TracingEngineResult result = results[i]; totalNodeCount += result.getNodeCount(); Inkscape::XML::Node *pathRepr = xml_doc->createElement("svg:path"); |