X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=b10ebf56b1c72be1338c463c47851006e58f13cd;hp=f4f306eb9b74c38c21e4666237133afd3fa9f705;hb=5d9bd33375efe24796ed442077385f67d9661520;hpb=af612c9c0b1fe5e3be37265dfa8691245e3222c7

diff --git a/src/document.cpp b/src/document.cpp
index f4f306e..b10ebf5 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -225,16 +225,16 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare
 	switch (type)
 	{
 		case QTC_TOP_LEFT:
-			orig_node = m_quadtree.nodes[orig_parent].top_left = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].top_left;
 			break;
 		case QTC_TOP_RIGHT:
-			orig_node = m_quadtree.nodes[orig_parent].top_right = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].top_right;
 			break;
 		case QTC_BOTTOM_LEFT:
-			orig_node = m_quadtree.nodes[orig_parent].bottom_left = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].bottom_left;
 			break;
 		case QTC_BOTTOM_RIGHT:
-			orig_node = m_quadtree.nodes[orig_parent].bottom_right = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].bottom_right;
 			break;
 		default:
 			Fatal("Tried to overlay a QuadTree child of invalid type!");
@@ -244,7 +244,8 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare
 
 	// Add us to the node's overlay linked list.
 	QuadTreeIndex prev_overlay = orig_node;
-	while (m_quadtree.nodes[prev_overlay].next_overlay != -1);
+	while (m_quadtree.nodes[prev_overlay].next_overlay != -1) prev_overlay = m_quadtree.nodes[prev_overlay].next_overlay;
+	Debug("- Original node %d, Previous overlay %d, new overlay %d", orig_node, prev_overlay, new_index);
 	m_quadtree.nodes[prev_overlay].next_overlay = new_index;
 
 	// Recurse into any extant children.
@@ -258,6 +259,7 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare
 		OverlayQuadChildren(orig_node, new_index, QTC_BOTTOM_RIGHT);
 
 	m_quadtree.nodes[new_index].object_dirty = m_quadtree.nodes[new_index].object_end;
+	m_quadtree.nodes[new_index].next_overlay = -1;
 }
 
 void Document::PropagateQuadChanges(QuadTreeIndex node)
@@ -443,11 +445,11 @@ done: // matches is not amused, but sulix is nice and moved it inside the #ifdef
 		m_count++;
 		PropagateQuadChanges(qti);
 	}
-#else // Although empty documents do always render correctly at any zoom,
-		// I suspect the markers will not be amused
-	m_count++;
+	return m_count-1;
+#else // words fail me (still not amused)
+	return (m_count++);
 #endif
-	return m_count; // Why can't we just use the size of types or something?
+	
 }
 
 unsigned Document::AddBezierData(const Bezier & bezier)
@@ -1143,28 +1145,43 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 	stbtt_FreeShape(font, instructions);
 }
 
-void Document::TransformObjectBounds(const SVGMatrix & transform)
+void Document::TransformObjectBounds(const SVGMatrix & transform, ObjectType type)
 {
+	#ifdef TRANSFORM_BEZIERS_TO_PATH
+		for (unsigned i = 0; i < m_objects.paths.size(); ++i)
+		{
+			Path & p = m_objects.paths[i];
+			p.m_bounds.x = transform.a * p.m_bounds.x + transform.e;
+			p.m_bounds.y = transform.d * p.m_bounds.y + transform.f;
+			p.m_bounds.w *= transform.a;
+			p.m_bounds.h *= transform.d;
+		}
+		return;
+	#endif		
+	
 	for (unsigned i = 0; i < m_count; ++i)
 	{
-		TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform);
-		m_objects.bounds[i].w *= transform.a;
-		m_objects.bounds[i].h *= transform.d;
+		if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type)
+		{
+			TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform);
+			m_objects.bounds[i].w *= transform.a;
+			m_objects.bounds[i].h *= transform.d;
+		}
 	}
 }
 
 void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType type)
 {
 	#ifdef TRANSFORM_BEZIERS_TO_PATH
-		for (unsigned i = 0; i < m_objects.paths.size(); ++i)
-		{
-			Path & p = m_objects.paths[i];
-			p.m_bounds.x += dx;
-			p.m_bounds.y += dy;
-		}
-		return;
-	#endif	
-	
+	for (unsigned i = 0; i < m_objects.paths.size(); ++i)
+	{
+		Path & p = m_objects.paths[i];
+		p.m_bounds.x += dx;
+		p.m_bounds.y += dy;
+	}
+	return;
+	#endif
+
 	for (unsigned i = 0; i < m_count; ++i)
 	{
 		if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type)