X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=a6c6fadb9c4ea50f40a43c4d53df9ec2d107aa88;hp=6c281c1a69637bc36f6ee01c85b8bab8c0d76d37;hb=239870c67910883756cffe6c963c7f7fa44402b9;hpb=694660b316623dc026d0525bbe8d82432425d4a0 diff --git a/src/document.cpp b/src/document.cpp index 6c281c1..a6c6fad 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -282,7 +282,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds) 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 = Real(svg.attribute("width").as_float()) * bounds.w; Real height = Real(svg.attribute("width").as_float()) * bounds.h; @@ -291,7 +291,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds) // Rectangles Real coords[4]; const char * attrib_names[] = {"x", "y", "width", "height"}; - for (pugi::xml_node rect : svg.children("rect")) + for (pugi::xml_node rect = svg.child("rect"); rect; rect = rect.next_sibling("rect")) { for (size_t i = 0; i < 4; ++i) coords[i] = rect.attribute(attrib_names[i]).as_float(); @@ -302,7 +302,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds) } // Circles - for (pugi::xml_node circle : svg.children("circle")) + for (pugi::xml_node circle = svg.child("circle"); circle; circle = circle.next_sibling("circle")) { Real cx = circle.attribute("cx").as_float(); Real cy = circle.attribute("cy").as_float(); @@ -320,7 +320,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds) } // paths - for (pugi::xml_node path : svg.children("path")) + for (pugi::xml_node path = svg.child("path"); path; path = path.next_sibling("path")) { string d = path.attribute("d").as_string();