Эх сурвалжийг харах

missing _H in two header files
deprecated IGL_NO_EIGEN forgotten in boundary_facets


Former-commit-id: 8fdcfe06f419d754a6ea171d064c7a95009e84ab

Romain Prévost 9 жил өмнө
parent
commit
24b4807c23

+ 3 - 3
include/igl/angle_bound_frame_fields.h

@@ -6,8 +6,8 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef IGL_ANGLE_BOUND_FRAME_FIELDS
-#define IGL_ANGLE_BOUND_FRAME_FIELDS
+#ifndef IGL_ANGLE_BOUND_FRAME_FIELDS_H
+#define IGL_ANGLE_BOUND_FRAME_FIELDS_H
 #include "igl_inline.h"
 
 #include <Eigen/Core>
@@ -58,4 +58,4 @@ namespace igl {
 #endif
 
 
-#endif /* defined(IGL_ANGLE_BOUND_FRAME_FIELDS) */
+#endif 

+ 5 - 7
include/igl/boundary_facets.cpp

@@ -1,9 +1,9 @@
 // This file is part of libigl, a simple c++ geometry processing library.
-// 
+//
 // Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public License 
-// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+//
+// This Source Code Form is subject to the terms of the Mozilla Public License
+// v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
 #include "boundary_facets.h"
 #include "face_occurrences.h"
@@ -98,7 +98,6 @@ IGL_INLINE void igl::boundary_facets(
 
 }
 
-#ifndef IGL_NO_EIGEN
 #include "list_to_matrix.h"
 #include "matrix_to_list.h"
 
@@ -122,11 +121,10 @@ template <typename DerivedT, typename Ret>
 Ret igl::boundary_facets(
   const Eigen::PlainObjectBase<DerivedT>& T)
 {
-  Ret F; 
+  Ret F;
   igl::boundary_facets(T,F);
   return F;
 }
-#endif
 
 
 #ifdef IGL_STATIC_LIBRARY

+ 5 - 10
include/igl/boundary_facets.h

@@ -1,17 +1,15 @@
 // This file is part of libigl, a simple c++ geometry processing library.
-// 
+//
 // Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
-// 
-// This Source Code Form is subject to the terms of the Mozilla Public License 
-// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+//
+// This Source Code Form is subject to the terms of the Mozilla Public License
+// v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
 #ifndef IGL_BOUNDARY_FACETS_H
 #define IGL_BOUNDARY_FACETS_H
 #include "igl_inline.h"
 
-#ifndef IGL_NO_EIGEN
-#  include <Eigen/Dense>
-#endif
+#include <Eigen/Dense>
 
 #include <vector>
 
@@ -34,7 +32,6 @@ namespace igl
     const std::vector<std::vector<IntegerT> > & T,
     std::vector<std::vector<IntegerF> > & F);
 
-#ifndef IGL_NO_EIGEN
   // Templates:
   //   DerivedT  integer-value: i.e. from MatrixXi
   //   DerivedF  integer-value: i.e. from MatrixXi
@@ -46,7 +43,6 @@ namespace igl
   template <typename DerivedT, typename Ret>
   Ret boundary_facets(
     const Eigen::PlainObjectBase<DerivedT>& T);
-#endif
 }
 
 #ifndef IGL_STATIC_LIBRARY
@@ -54,4 +50,3 @@ namespace igl
 #endif
 
 #endif
-

+ 3 - 3
include/igl/conjugate_frame_fields.h

@@ -6,8 +6,8 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef IGL_CONJUGATE_FRAME_FIELDS
-#define IGL_CONJUGATE_FRAME_FIELDS
+#ifndef IGL_CONJUGATE_FRAME_FIELDS_H
+#define IGL_CONJUGATE_FRAME_FIELDS_H
 #include "igl_inline.h"
 #include "ConjugateFFSolverData.h"
 #include <Eigen/Core>
@@ -60,4 +60,4 @@ namespace igl {
 #endif
 
 
-#endif /* defined(IGL_CONJUGATE_FRAME_FIELDS) */
+#endif