Bezier bounds rectangles are calculated correctly

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

diff --git a/src/document.h b/src/document.h
index 52e9295..6592f4b 100644 (file)
--- a/src/document.h
+++ b/src/document.h
@@ -14,10 +14,11 @@ namespace IPDF
        struct SVGMatrix
        {
                Real a; // width
-               Real b; // skew y by x
                Real c; // skew x by y
-               Real d; // height
                Real e; // translate x
+               
+               Real b; // skew y by x
+               Real d; // height
                Real f; // translate y
        };
        // SVG matrix transforms (x,y) <- (a x' + c y' + e, b x' + d y' + f)
@@ -49,7 +50,9 @@ namespace IPDF
                        bool operator==(const Document & equ) const;
                        bool operator!=(const Document & equ) const {return !(this->operator==(equ));}
 
-                       void Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
+                       unsigned AddGroup(unsigned start_index, unsigned end_index);
+                       unsigned AddBezier(const Bezier & bezier);
+                       unsigned Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
                        unsigned AddBezierData(const Bezier & bezier);
                        
 
@@ -66,7 +69,7 @@ namespace IPDF
                        /** Parse an SVG node or SVG-group node, adding children to the document **/
                        void ParseSVGNode(pugi::xml_node & root, SVGMatrix & transform);
                        /** Parse an SVG path with string **/
-                       void ParseSVGPathData(const std::string & d, const SVGMatrix & transform);
+                       std::pair<unsigned, unsigned> ParseSVGPathData(const std::string & d, const SVGMatrix & transform);
                        
                        /** Modify an SVG transformation matrix **/
                        static void ParseSVGTransform(const std::string & s, SVGMatrix & transform);
@@ -81,6 +84,8 @@ namespace IPDF
                        inline const QuadTree& GetQuadTree() { if (m_quadtree.root_id == QUADTREE_EMPTY) { GenBaseQuadtree(); } return m_quadtree; }
                        QuadTreeIndex GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type);
                        QuadTreeIndex GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren mytype);
+                       // Returns the number of objects the current object formed when clipped, the objects in question are added to the end of the document.
+                       int ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type);
 #endif
 
                private: