2 files changed, 5 insertions, 4 deletions
diff --git a/svg-flatten/include/geom2d.hpp b/svg-flatten/include/geom2d.hpp
index 82dbfb5..9f83754 100644
--- a/svg-flatten/include/geom2d.hpp
+++ b/svg-flatten/include/geom2d.hpp
@@ -72,14 +72,14 @@ namespace gerbolyze {
             }
 
             xform2d &translate(double x, double y) {
-                x0 += x*xx + y*xy;
-                y0 += y*yy + x*yx;
+                xform2d xf(1, 0, 0, 1, x, y);
+                transform(xf);
                 return *this;
             }
 
             xform2d &scale(double x, double y) {
-                xx *= x; yx *= y; xy *= x;
-                yy *= y; x0 *= x; y0 *= y;
+                xform2d xf(x, 0, 0, y);
+                transform(xf);
                 return *this;
             }
 
diff --git a/svg-flatten/include/gerbolyze.hpp b/svg-flatten/include/gerbolyze.hpp
index a30d7eb..9b05bdb 100644
--- a/svg-flatten/include/gerbolyze.hpp
+++ b/svg-flatten/include/gerbolyze.hpp
@@ -166,6 +166,7 @@ namespace gerbolyze {
         double curve_tolerance_mm;
         VectorizerSelectorizer &m_vec_sel;
         bool outline_mode = false;
+        bool flip_color_interpretation = false;
     };
 
     class SVGDocument {