Permalink
Browse files

fixes for test suite and gcc

  • Loading branch information...
1 parent 45e5cde commit f54797cfbda8b7e667fd5294bbca3b885d1b18de @donbright donbright committed Oct 28, 2012
Showing with 10 additions and 8 deletions.
  1. +5 −4 src/svg.cc
  2. +3 −3 src/svg.h
  3. +2 −1 tests/CMakeLists.txt
View
@@ -7,6 +7,9 @@ namespace OpenSCAD {
// SVG code
// currently for debugging, not necessarily pretty or useful for users. (yet)
+int svg_cursor_py = 0;
+int svg_px_width = SVG_PXW;
+int svg_px_height = SVG_PXH;
std::string svg_header( int widthpx, int heightpx )
{
@@ -70,8 +73,6 @@ CGAL_Point_2e project_svg_3to2( CGAL_Point_3 p, CGAL_Iso_cuboid_3 bbox )
CGAL_Point_2e project_svg_2to2( CGAL_Point_2e p, CGAL_Iso_rectangle_2e bbox )
{
- double x = CGAL::to_double( p.x() );
- double y = CGAL::to_double( p.y() );
double screenw = svg_px_width;
double screenh = svg_px_height;
double borderw = screenw * 0.1618;
@@ -172,10 +173,10 @@ class NefPoly3_dumper_svg {
{
bbox = bounding_box( N );
}
- void visit(CGAL_Nef_polyhedron3::Vertex_const_handle v) {}
+ void visit(CGAL_Nef_polyhedron3::Vertex_const_handle ) {}
void visit(CGAL_Nef_polyhedron3::Halfedge_const_handle ) {}
void visit(CGAL_Nef_polyhedron3::SHalfedge_const_handle ) {}
- void visit(CGAL_Nef_polyhedron3::SHalfloop_const_handle shh ){}
+ void visit(CGAL_Nef_polyhedron3::SHalfloop_const_handle ) {}
void visit(CGAL_Nef_polyhedron3::SFace_const_handle ) {}
void visit( CGAL_Nef_polyhedron3::Halffacet_const_handle hfacet )
{
View
@@ -11,9 +11,9 @@ namespace OpenSCAD {
#define SVG_PXW 480
#define SVG_PXH 480
-static int svg_cursor_py = 0;
-static int svg_px_width = SVG_PXW;
-static int svg_px_height = SVG_PXH;
+extern int svg_cursor_py;
+extern int svg_px_width;
+extern int svg_px_height;
std::string svg_header( int widthpx = SVG_PXW, int heightpx = SVG_PXH );
std::string svg_label( std::string s );
View
@@ -425,7 +425,8 @@ set(CGAL_SOURCES
../src/CGALCache.cc
../src/PolySetCGALEvaluator.cc
../src/CGAL_Nef_polyhedron_DxfData.cc
- ../src/cgaladv_minkowski2.cc)
+ ../src/cgaladv_minkowski2.cc
+ ../src/svg.cc)
set(COMMON_SOURCES
../src/nodedumper.cc

0 comments on commit f54797c

Please sign in to comment.