git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.ucc.asn.au:ipdf/code
[ipdf/code.git]
/
src
/
path.h
diff --git
a/src/path.h
b/src/path.h
index
7eb8dee
..
06aff7a
100644
(file)
--- a/
src/path.h
+++ b/
src/path.h
@@
-1,20
+1,26
@@
#ifndef _PATH_H
#define _PATH_H
#ifndef _PATH_H
#define _PATH_H
+#include "transformationtype.h"
#include <vector>
#include <algorithm>
#include "rect.h"
#include "real.h"
#include <vector>
#include <algorithm>
#include "rect.h"
#include "real.h"
-#ifdef QUADTREE_DISABLED
-
-#define TRANSFORM_BEZIERS_TO_PATH
-
-
+#ifdef TRANSFORM_BEZIERS_TO_PATH
+ #include "gmprat.h"
+ #include "paranoidnumber.h"
#endif
#endif
+
namespace IPDF
{
namespace IPDF
{
+ #ifdef TRANSFORM_BEZIERS_TO_PATH
+ typedef Gmprat PReal;
+ #else
+ typedef Real PReal;
+ #endif
+ typedef TRect<PReal> PRect;
struct Colour
{
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));
{
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<Vec2> & FillPoints(const Objects & objects, const View & view);
Rect & GetBounds(Objects & objects);
std::vector<Vec2> & FillPoints(const Objects & objects, const View & view);
@@
-53,6
+59,9
@@
namespace IPDF
std::vector<Vec2> m_fill_points;
std::vector<Vec2> m_fill_points;
+ PRect m_bounds;
+
+
Colour m_fill; // colour to fill with
Colour m_stroke; // colour to outline with
};
Colour m_fill; // colour to fill with
Colour m_stroke; // colour to outline with
};
UCC
git Repository :: git.ucc.asn.au