From: Sam Moore <matches@ucc.asn.au>
Date: Fri, 8 Aug 2014 08:08:30 +0000 (+0800)
Subject: Merge branch 'master' of git://git.ucc.asn.au/ipdf/code
X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=commitdiff_plain;h=239870c67910883756cffe6c963c7f7fa44402b9

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

239870c67910883756cffe6c963c7f7fa44402b9
diff --cc src/document.cpp
index a4d6be6,6c281c1..a6c6fad
--- a/src/document.cpp
+++ b/src/document.cpp
@@@ -280,10 -282,10 +282,10 @@@ void Document::LoadSVG(const string & f
  	input.close();
  
  	// Combine all SVG tags into one thing because lazy
 -	for (xml_node svg : doc_xml.children("svg"))
 +	for (xml_node svg = doc_xml.child("svg"); svg; svg = svg.next_sibling("svg"))
  	{
- 		Real width = svg.attribute("width").as_float() * bounds.w;
- 		Real height = svg.attribute("width").as_float() * bounds.h;
+ 		Real width = Real(svg.attribute("width").as_float()) * bounds.w;
+ 		Real height = Real(svg.attribute("width").as_float()) * bounds.h;
  		
  		
  		// Rectangles