Bläddra i källkod

warnings

Former-commit-id: 20edc7ee12477c41e5926d7c763132ecd840dbec
Alec Jacobson 9 år sedan
förälder
incheckning
d3df9653ad

+ 6 - 2
include/igl/AABB.h

@@ -768,7 +768,7 @@ inline typename igl::AABB<DerivedV,DIM>::Scalar igl::AABB<DerivedV,DIM>::squared
   const AABB<Derivedother_V,DIM> * other,
   const Eigen::PlainObjectBase<Derivedother_V> & other_V,
   const Eigen::MatrixXi & other_Ele, 
-  const Scalar min_sqr_d,
+  const Scalar /*min_sqr_d*/,
   Eigen::PlainObjectBase<DerivedsqrD> & sqrD,
   Eigen::PlainObjectBase<DerivedI> & I,
   Eigen::PlainObjectBase<DerivedC> & C) const
@@ -1098,7 +1098,11 @@ inline void igl::AABB<DerivedV,DIM>::leaf_squared_distance(
 
 template <typename DerivedV, int DIM>
 inline void igl::AABB<DerivedV,DIM>::set_min(
-  const RowVectorDIMS & p,
+  const RowVectorDIMS & 
+#ifndef NDEBUG
+  p
+#endif
+  ,
   const Scalar sqr_d_candidate,
   const int i_candidate,
   const RowVectorDIMS & c_candidate,

+ 1 - 1
include/igl/cgal/order_facets_around_edges.cpp

@@ -284,7 +284,7 @@ IGL_INLINE void igl::cgal::order_facets_around_edges(
         const auto ref_corner_s = (ref_corner_o+1)%3;
         const auto ref_corner_d = (ref_corner_o+2)%3;
 
-        const typename DerivedF::Scalar o = F(ref_face, ref_corner_o);
+        //const typename DerivedF::Scalar o = F(ref_face, ref_corner_o);
         const typename DerivedF::Scalar s = F(ref_face, ref_corner_s);
         const typename DerivedF::Scalar d = F(ref_face, ref_corner_d);
 

+ 2 - 2
include/igl/outer_element.cpp

@@ -104,7 +104,7 @@ IGL_INLINE void igl::outer_edge(
    typedef typename DerivedV::Index Index;
    typedef typename Eigen::Matrix<Scalar, 3, 1> ScalarArray3;
    typedef typename Eigen::Matrix<typename DerivedF::Scalar, 3, 1> IndexArray3;
-   const size_t INVALID = std::numeric_limits<size_t>::max();
+   const Index INVALID = std::numeric_limits<Index>::max();
 
    Index outer_vid;
    Eigen::Matrix<Index,Eigen::Dynamic,1> candidate_faces;
@@ -123,7 +123,7 @@ IGL_INLINE void igl::outer_edge(
 
    Scalar outer_slope_YX = 0;
    Scalar outer_slope_ZX = 0;
-   size_t outer_opp_vid = INVALID;
+   Index outer_opp_vid = INVALID;
    bool infinite_slope_detected = false;
    std::vector<Index> incident_faces;
    auto check_and_update_outer_edge = [&](Index opp_vid, Index fid) {