From c8317febdcb31d1bce95a3e68de452be9cc1e7ea Mon Sep 17 00:00:00 2001 From: cignoni Date: Sun, 6 Apr 2008 06:50:00 +0000 Subject: [PATCH] added missing namespaces --- wrap/io_edgemesh/export_svg.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wrap/io_edgemesh/export_svg.h b/wrap/io_edgemesh/export_svg.h index 9bada6b7..81e81f47 100644 --- a/wrap/io_edgemesh/export_svg.h +++ b/wrap/io_edgemesh/export_svg.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.11 2007/07/12 11:02:06 andrenucci +Scale in SingleFile mode changed, it have to be calcolated before draw. + Revision 1.10 2007/07/10 07:48:41 cignoni changed a template >> into > > @@ -263,7 +266,7 @@ public: SVGProperties properties; return Save(mp, filename, properties); } - static bool Save(vector *vp, const char *filename, SVGProperties & pro){ + static bool Save(std::vector *vp, const char *filename, SVGProperties & pro){ //Function that export a vector of EdgeMesh in an unic single SVG file. FILE * o = fopen(filename,"w"); if (o==NULL) @@ -286,7 +289,7 @@ public: pmax[0]=max(pmax[0], pma->X()); pmax[1]=max(pmax[1], pma->Y()); } - float maxEdge=max(pmax[0]-pmin[0], pmax[1]-pmin[1]); + float maxEdge=std::max(pmax[0]-pmin[0], pmax[1]-pmin[1]); float scl = (pro.getViewBox().V(0)/pro.numCol) /maxEdge ; pro.setScale(scl); pro.setMinPoint(new Point2f(pmin[0],pmin[1])); @@ -355,7 +358,7 @@ public: v1.Normalize(); Point3d v2 = v1 ^ props.projPlane()->Direction(); //Global points - vector >* glb; + std::vector< std::vector >* glb; std::vector pts; pts.clear(); Point2f pmin(100000000.0f, 100000000.0f);