merge

Former-commit-id: c86f3195effb437998963a57963221fa6612757d

RELEASE_HISTORY.txt

@@ -1,3 +1,4 @@
+0.2.1  Bug fixes in barycenter and doublearea found by Martin Bisson
 0.2.0  XML serializer more stable and fixed bug in remove_duplicate_vertices
 0.1.8  Embree and xml (windows only) extras
 0.1.5  Compilation on windows, bug fix for compilation with cygwin

VERSION.txt

@@ -3,4 +3,4 @@
 # Anyone may increment Minor to indicate a small change.
 # Major indicates a large change or large number of changes (upload to website)
 # World indicates a substantial change or release
-0.2.0
+0.2.1

include/igl/edgetopology.cpp

@@ -1,8 +1,3 @@
-//
-//  IGL Lib - Simple C++ mesh library 
-//
-//  Copyright 2011, Daniele Panozzo. All rights reserved.
-
 #include "edgetopology.h"
 #include <algorithm>
 #include "is_manifold.h"
@@ -15,6 +10,7 @@ IGL_INLINE void igl::edgetopology(
   Eigen::MatrixXi& FE, 
   Eigen::MatrixXi& EF)
 {
+  // Only needs to be edge-manifold
   assert(igl::is_manifold(V,F));
   std::vector<std::vector<int> > ETT;
   for(int f=0;f<F.rows();++f)

include/igl/edgetopology.h

@@ -1,8 +1,3 @@
-//
-//  IGL Lib - Simple C++ mesh library 
-//
-//  Copyright 2011, Daniele Panozzo. All rights reserved.
-
 #ifndef IGL_EDGETOPOLOGY_H
 #define IGL_EDGETOPOLOGY_H
 

include/igl/matlab/mexErrMsgTxt.cpp

@@ -0,0 +1,13 @@
+#include "mexErrMsgTxt.h"
+
+// Overload mexErrMsgTxt to check an assertion then print text only if
+// assertion fails
+#include "mex.h"
+IGL_INLINE void igl::mexErrMsgTxt(bool assertion, const char * text)
+{
+  if(!assertion)
+  {
+    ::mexErrMsgTxt(text);
+  }
+}
+

include/igl/matlab/mexErrMsgTxt.h

@@ -0,0 +1,6 @@
+#include "../igl_inline.h"
+namespace igl
+{
+  // Wrapper for mexErrMsgTxt that only calls error if test fails
+  IGL_INLINE void mexErrMsgTxt(bool test, const char * message);
+}