Merge branch 'master' of git://git.ucc.asn.au/ipdf/code

[ipdf/code.git] / src / document.h

diff --git a/src/document.h b/src/document.h
index 14a87d8..62f624c 100644 (file)
--- a/src/document.h
+++ b/src/document.h
@@ -4,6 +4,8 @@
 #include "ipdf.h"
 #include "quadtree.h"
 
+typedef struct stbtt_fontinfo stbtt_fontinfo;
+
 namespace IPDF
 {
        class Document
@@ -12,7 +14,7 @@ namespace IPDF
                        Document(const std::string & filename = "") : m_objects(), m_count(0) {Load(filename);}
                        virtual ~Document() {}
                        
-                       void LoadSVG(const std::string & filename, const Rect & bounds = {0,0,1,1});
+                       void LoadSVG(const std::string & filename, const Rect & bounds = Rect(0,0,1,1));
 
                        void Load(const std::string & filename = "");
                        void Save(const std::string & filename);
@@ -29,6 +31,8 @@ namespace IPDF
                        
                        void AddPathFromString(const std::string & d, const Rect & bounds);
 
+                       void AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y);
+
 #ifndef QUADTREE_DISABLED
                        inline const QuadTree& GetQuadTree() { if (m_quadtree.root_id == QUADTREE_EMPTY) { GenBaseQuadtree(); } return m_quadtree; }
                        QuadTreeIndex GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type);