summaryrefslogtreecommitdiffstats
path: root/src/trace/potrace/inkscape-potrace.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2015-11-08 17:41:53 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2015-11-08 17:41:53 +0000
commit6f6964733c7de8c54dc60f946e10ea66bac269ea (patch)
tree7bf87243cba2632c964b047e07ebb03de2fdc4aa /src/trace/potrace/inkscape-potrace.cpp
parentRebase on upstream libcroco 0.6.9 and backport minor fixes (diff)
downloadinkscape-6f6964733c7de8c54dc60f946e10ea66bac269ea.tar.gz
inkscape-6f6964733c7de8c54dc60f946e10ea66bac269ea.zip
Use external Potrace
(bzr r14449.1.1)
Diffstat (limited to 'src/trace/potrace/inkscape-potrace.cpp')
-rw-r--r--src/trace/potrace/inkscape-potrace.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp
index 8f3bb7bdf..a0b0df1f6 100644
--- a/src/trace/potrace/inkscape-potrace.cpp
+++ b/src/trace/potrace/inkscape-potrace.cpp
@@ -29,7 +29,6 @@
#include "message-stack.h"
#include <sp-path.h>
#include <svg/path-string.h>
-#include "curve.h"
#include "bitmap.h"
using Glib::ustring;
@@ -128,7 +127,7 @@ static bool hasPoint(std::vector<Point> &points, double x, double y)
/**
- * Recursively descend the path_t node tree, writing paths in SVG
+ * Recursively descend the potrace_path_t node tree, writing paths in SVG
* format into the output stream. The Point vector is used to prevent
* redundant paths. Returns number of paths processed.
*/
@@ -144,7 +143,7 @@ static long writePaths(PotraceTracingEngine *engine, potrace_path_t *plist,
//g_message("node->fm:%d\n", node->fm);
if (!curve->n)
continue;
- dpoint_t *pt = curve->c[curve->n - 1];
+ const potrace_dpoint_t *pt = curve->c[curve->n - 1];
double x0 = 0.0;
double y0 = 0.0;
double x1 = 0.0;
@@ -192,7 +191,7 @@ static long writePaths(PotraceTracingEngine *engine, potrace_path_t *plist,
}
data.closePath();
- for (path_t *child=node->childlist; child ; child=child->sibling)
+ for (potrace_path_t *child=node->childlist; child ; child=child->sibling)
{
nodeCount += writePaths(engine, child, data, points);
}