Merge branch 'master' of git://git.ucc.asn.au/ipdf/code
authorSam Moore <matches@ucc.asn.au>
Fri, 8 Aug 2014 08:08:30 +0000 (16:08 +0800)
committerSam Moore <matches@ucc.asn.au>
Fri, 8 Aug 2014 08:08:30 +0000 (16:08 +0800)
1  2 
src/document.cpp
src/document.h

@@@ -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

UCC git Repository :: git.ucc.asn.au