Merge branch 'master' into gh-pages

Former-commit-id: 821cae5e5d954abd44ad8d29c3ad9632d3061822

include/igl/copyleft/cgal/piecewise_constant_winding_number.cpp

@@ -12,7 +12,7 @@
 #include <algorithm>
 
 template < typename DerivedV, typename DerivedF>
-IGL_INLINE bool igl::piecewise_constant_winding_number(
+IGL_INLINE bool igl::copyleft::cgal::piecewise_constant_winding_number(
   const Eigen::PlainObjectBase<DerivedV> & V,
   const Eigen::PlainObjectBase<DerivedF> & F)
 {

include/igl/project_to_line_segment.cpp

@@ -28,7 +28,7 @@ IGL_INLINE void igl::project_to_line_segment(
 #pragma omp parallel for if (np>10000)
   for(int p = 0;p<np;p++)
   {
-    const Eigen::PlainObjectBase<DerivedP> Pp = P.row(p);
+    const DerivedP Pp = P.row(p);
     if(t(p)<0)
     {
       sqrD(p) = (Pp-S).squaredNorm();