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

diff --git a/src/document.cpp b/src/document.cpp
index b347c76..b10ebf5 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -445,8 +445,11 @@ done: // matches is not amused, but sulix is nice and moved it inside the #ifdef
 		m_count++;
 		PropagateQuadChanges(qti);
 	}
+	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)
@@ -1142,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)