X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fpath.cpp;h=c58d3df977d7e944fb9ca76c2ef0087382c597c2;hb=6472d20ee58d2ecc0aee8bc1a12a071b2afc8a27;hp=e0eca4a0964d777fa19c7b032ac7b724e0921f0f;hpb=35f1190c8c8036ed11180656769cf0c1cbf7c2b3;p=ipdf%2Fcode.git diff --git a/src/path.cpp b/src/path.cpp index e0eca4a..c58d3df 100644 --- a/src/path.cpp +++ b/src/path.cpp @@ -5,8 +5,8 @@ using namespace std; namespace IPDF { -Path::Path(const Objects & objects, unsigned start, unsigned end, const Colour & fill) - : m_start(start), m_end(end), m_fill(fill) +Path::Path(const Objects & objects, unsigned start, unsigned end, const Colour & fill, const Colour & stroke) + : m_start(start), m_end(end), m_fill(fill), m_stroke(stroke) { Real xmin = 0; Real ymin = 0; Real xmax = 0; Real ymax = 0; @@ -126,7 +126,7 @@ bool Path::PointInside(const Objects & objects, const Vec2 & pt, bool debug) con for (unsigned i = 0; i < x_ints.size(); ++i) { if (debug) - Debug("X Intersection %u at %f,%f vs %f,%f", i,x_ints[i].x, x_ints[i].y, pt.x, pt.y); + Debug("X Intersection %u at %f,%f vs %f,%f", i,Double(x_ints[i].x), Double(x_ints[i].y), Double(pt.x), Double(pt.y)); if (x_ints[i].y >= pt.y) { @@ -147,7 +147,7 @@ bool Path::PointInside(const Objects & objects, const Vec2 & pt, bool debug) con for (unsigned i = 0; i < y_ints.size(); ++i) { if (debug) - Debug("Y Intersection %u at %f,%f vs %f,%f", i,x_ints[i].x, x_ints[i].y, pt.x, pt.y); + Debug("Y Intersection %u at %f,%f vs %f,%f", i,Double(y_ints[i].x), Double(y_ints[i].y), Double(pt.x), Double(pt.y)); if (y_ints[i].x >= pt.x) {