Merge pull request #4728 from openscad/update-manifold

Bump manifold to latest version (v2.2.1-3-gb6eea01).

src/core/builtin_functions.cc

@@ -399,7 +399,6 @@ Value builtin_ord(Arguments arguments, const Location& loc)
     return Value::undefined.clone();
   }
   const str_utf8_wrapper& arg_str = arguments[0]->toStrUtf8Wrapper();
-  const char *ptr = arg_str.c_str();
   if (!arg_str.utf8_validate()) {
     LOG(message_group::Warning, loc, arguments.documentRoot(), "ord() argument '%1$s' is not a valid utf8 string", arg_str.toString());
     return Value::undefined.clone();

src/geometry/manifold/ManifoldGeometry.cc

@@ -136,7 +136,7 @@ shared_ptr<Polyhedron> ManifoldGeometry::toPolyhedron() const
 template shared_ptr<CGAL::Polyhedron_3<CGAL_Kernel3>> ManifoldGeometry::toPolyhedron() const;
 
 shared_ptr<manifold::Manifold> binOp(ManifoldGeometry& lhs, ManifoldGeometry& rhs, manifold::OpType opType) {
-  return make_shared<manifold::Manifold>(std::move(lhs.getManifold().Boolean(rhs.getManifold(), opType)));
+  return make_shared<manifold::Manifold>(lhs.getManifold().Boolean(rhs.getManifold(), opType));
 }
 
 void ManifoldGeometry::operator+=(ManifoldGeometry& other) {
@@ -175,7 +175,7 @@ void ManifoldGeometry::transform(const Transform3d& mat) {
     mat(0, 2), mat(1, 2), mat(2, 2),
     mat(0, 3), mat(1, 3), mat(2, 3)
   );                            
-  manifold_ = make_shared<manifold::Manifold>(std::move(getManifold().Transform(glMat)));
+  manifold_ = make_shared<manifold::Manifold>(getManifold().Transform(glMat));
 }
 
 BoundingBox ManifoldGeometry::getBoundingBox() const

src/geometry/manifold/manifold-applyops-minkowski.cc

@@ -56,7 +56,7 @@ shared_ptr<const Geometry> applyMinkowskiManifold(const Geometry::Geometries& ch
     for (auto pi = poly.vertices_begin(); pi != poly.vertices_end(); ++pi) {
       out.push_back(conv(pi->point()));
     }
-    return std::move(out);
+    return out;
   };
 
   try {

src/geometry/manifold/manifoldutils.h

@@ -9,7 +9,7 @@ class PolySet;
 
 namespace manifold {
   class Manifold;
-  class Mesh;
+  struct Mesh;
 };
 
 namespace ManifoldUtils {

src/io/export_pdf.cc

@@ -51,7 +51,6 @@ void draw_grid(cairo_t *cr, double left, double right, double bottom, double top
   double lightLine=0.24;
   int major = (gridSize>10.? gridSize: int(10./gridSize));
 
-  double offset = mm_to_points(gridSize);
   double pts=0.;  // for iteration across page
 
   // bounds are margins in points.
@@ -96,7 +95,6 @@ void draw_grid(cairo_t *cr, double left, double right, double bottom, double top
 // New draw_axes (renamed from axis since it draws both).  
 void draw_axes(cairo_t *cr, double left, double right, double bottom, double top){
   double darkerLine=0.36;
-  double faintLine=0.24;
   double offset = mm_to_points(5.);
   double pts=0.;  // for iteration across page