X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fdocument.cpp;h=c41c848d3f289f213473ba3ec92ffd0eb4de2e4c;hb=6b7e92069596a3f19fbe068b14a9c5ef59c22061;hp=1e768bd92d47d752f733acc929174273e8faebb5;hpb=58a6719da2337b3e6e20b581885f170bbe5fc480;p=ipdf%2Fcode.git

diff --git a/src/document.cpp b/src/document.cpp
index 1e768bd..c41c848 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -4,6 +4,7 @@
 #include <fstream>
 
 #include "../contrib/pugixml-1.4/src/pugixml.cpp"
+#include "transformationtype.h"
 
 #include "stb_truetype.h"
 
@@ -168,7 +169,7 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type)
 {
 	QuadTreeIndex new_index = m_quadtree.nodes.size();
-	Debug("-------------- Generating Quadtree Node %d (parent %d) ----------------------", new_index, parent);
+	Debug("-------------- Generating Quadtree Node %d (parent %d, type %d) ----------------------", new_index, parent, type);
 	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0, -1});
 
 	m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size();
@@ -1059,8 +1060,8 @@ void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType typ
 		for (unsigned i = 0; i < m_objects.paths.size(); ++i)
 		{
 			Path & p = m_objects.paths[i];
-			p.x += dx;
-			p.y += dy;
+			p.m_bounds.x += dx;
+			p.m_bounds.y += dy;
 		}
 		return;
 	#endif	
@@ -1081,14 +1082,14 @@ void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real
 		for (unsigned i = 0; i < m_objects.paths.size(); ++i)
 		{
 			Path & p = m_objects.paths[i];
-			p.w /= scale_amount;
-			p.h /= scale_amount;
-			p.x -= x;
-			p.x /= scale_amount;
-			p.x += x;
-			p.y -= y;
-			p.y /= scale_amount;
-			p.y += y;
+			p.m_bounds.w /= scale_amount;
+			p.m_bounds.h /= scale_amount;
+			p.m_bounds.x -= x;
+			p.m_bounds.x /= scale_amount;
+			p.m_bounds.x += x;
+			p.m_bounds.y -= y;
+			p.m_bounds.y /= scale_amount;
+			p.m_bounds.y += y;
 		}
 		return;
 	#endif