X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fdocument.cpp;h=1558865f1c8c9a72ad7e1a2baaa74395ac8e6d37;hb=ae6af9f5e166d675a7139ec6dffee4ccab4347bc;hp=589073039f7361164340532fc11da8e13695f70c;hpb=815a521a657dd67ab1d7b8b6a8804c061ca09c16;p=ipdf%2Fcode.git

diff --git a/src/document.cpp b/src/document.cpp
index 5890730..1558865 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -392,12 +392,12 @@ static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const s
 {
 	string token("");
 	while (GetToken(d, token, i, delims) == ",");
-	x = strtod(token.c_str(),NULL);
+	x = RealFromStr(token);
 	if (GetToken(d, token, i, delims) != ",")
 	{
 		Fatal("Expected \",\" seperating x,y pair");
 	}
-	y = strtod(GetToken(d, token, i, delims).c_str(),NULL);
+	y = RealFromStr(GetToken(d,token,i,delims));
 }
 
 static bool GetKeyValuePair(const string & d, string & key, string & value, unsigned & i, const string & delims = "()[],{}<>;:=")
@@ -460,11 +460,11 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 		}
 		else if (command == "scale")
 		{
-			delta.a = (strtod(GetToken(s,token,i).c_str(), NULL));
+			delta.a = RealFromStr(GetToken(s,token,i));
 			GetToken(s, token, i);
 			if (token == ",")
 			{
-				delta.d = (strtod(GetToken(s,token,i).c_str(), NULL));
+				delta.d = RealFromStr(GetToken(s,token,i));
 				assert(GetToken(s, token, i) == ")");
 			}
 			else
@@ -510,7 +510,7 @@ inline Colour ParseColourString(const string & colour_str)
 		c = {255,255,255,255};
 	else if (colour_str.size() == 7 && colour_str[0] == '#')
 	{
-		Debug("Parse colour string: \"%s\"", colour_str.c_str());
+		//Debug("Parse colour string: \"%s\"", colour_str.c_str());
 		char comp[3] = {colour_str[1], colour_str[2], '\0'};
 		c.r = strtoul(comp, NULL, 16);
 		comp[0] = colour_str[3]; comp[1] = colour_str[4];
@@ -518,7 +518,7 @@ inline Colour ParseColourString(const string & colour_str)
 		comp[0] = colour_str[5]; comp[1] = colour_str[6];
 		c.b = strtoul(comp, NULL, 16);
 		c.a = 255;
-		Debug("Colour is: %u, %u, %u, %u", c.r, c.g, c.b, c.a);
+		//Debug("Colour is: %u, %u, %u, %u", c.r, c.g, c.b, c.a);
 	}
 	return c;
 }
@@ -527,7 +527,16 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 {
 	//Debug("Parse node <%s>", root.name());
 
-		
+	
+	// Centre the SVGs
+	if (strcmp(root.name(),"svg") == 0)
+	{
+		Real ww = RealFromStr(root.attribute("width").as_string());
+		Real hh = RealFromStr(root.attribute("height").as_string());
+		parent_transform.e -= parent_transform.a * ww/Real(2);
+		parent_transform.f -= parent_transform.d * hh/Real(2);
+	}
+	
 	for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
 	{
 		SVGMatrix transform(parent_transform);	
@@ -709,7 +718,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
 	
 	input.close();
 						// a c e, b d f
-	SVGMatrix transform = {bounds.w, 0,bounds.x, 0,bounds.h,bounds.y};
+	SVGMatrix transform = {bounds.w,0 ,bounds.x, 0,bounds.h,bounds.y};
 	ParseSVGNode(doc_xml, transform);
 }
 
@@ -755,9 +764,9 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		if (command == "m" || command == "M")
 		{
 			//Debug("Construct moveto command");
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[0] = (relative) ? x[0] + dx : dx;
 			y[0] = (relative) ? y[0] + dy : dy;
@@ -770,25 +779,25 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		else if (command == "c" || command == "C" || command == "q" || command == "Q")
 		{
 			//Debug("Construct curveto command");
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[1] = (relative) ? x[0] + dx : dx;
 			y[1] = (relative) ? y[0] + dy : dy;
 			
-			dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[2] = (relative) ? x[0] + dx : dx;
 			y[2] = (relative) ? y[0] + dy : dy;
 			
 			if (command != "q" && command != "Q")
 			{
-				dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dx = RealFromStr(GetToken(d,token,i,delims));
 				assert(GetToken(d,token,i,delims) == ",");
-				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dy = RealFromStr(GetToken(d,token,i,delims));
 				x[3] = (relative) ? x[0] + dx : dx;
 				y[3] = (relative) ? y[0] + dy : dy;
 			}
@@ -821,12 +830,12 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		{
 			//Debug("Construct lineto command, relative %d", relative);
 		
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
 			Real dy;
 			if (command == "l" || command == "L")
 			{
 				assert(GetToken(d,token,i,delims) == ",");
-				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dy = RealFromStr(GetToken(d,token,i,delims));
 			}
 			else if (command == "v" || command == "V")
 			{