X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fpath.h;h=2aa7840450abcba370c0f7e2b48830257e0ee99d;hp=7eb8dee629f1aacf44cfa7479e340e9ab5c8fa55;hb=326f04a375ce3120f7e8957e3d7cd5f296f513e3;hpb=2d12d37f1657d6aef9bb80d735b6c7022aecba6e diff --git a/src/path.h b/src/path.h index 7eb8dee..2aa7840 100644 --- a/src/path.h +++ b/src/path.h @@ -1,20 +1,26 @@ #ifndef _PATH_H #define _PATH_H +#include "transformationtype.h" #include #include #include "rect.h" #include "real.h" -#ifdef QUADTREE_DISABLED - -#define TRANSFORM_BEZIERS_TO_PATH - +#ifdef TRANSFORM_BEZIERS_TO_PATH + #include "gmprat.h" #endif + namespace IPDF { + #ifdef TRANSFORM_BEZIERS_TO_PATH + typedef Gmprat PReal; + #else + typedef Real PReal; + #endif + typedef TRect PRect; struct Colour { @@ -35,7 +41,7 @@ namespace IPDF { Path(Objects & objects, unsigned _start, unsigned _end, const Colour & _fill = Colour(128,128,128,255), const Colour & _stroke = Colour(0,0,0,0)); - Rect SolveBounds(const Objects & objects) const; + Rect SolveBounds(const Objects & objects); Rect & GetBounds(Objects & objects); std::vector & FillPoints(const Objects & objects, const View & view); @@ -53,6 +59,9 @@ namespace IPDF std::vector m_fill_points; + PRect m_bounds; + + Colour m_fill; // colour to fill with Colour m_stroke; // colour to outline with };