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

diff --cc src/document.cpp
index a4d6be6,6c281c1..a6c6fad
--- 1/src/document.cpp
--- 2/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

diff --cc src/document.h
Simple merge