completing the merge

Former-commit-id: 6fe5da3ff3a2408901ce34ee77a03932d87a5a46

include/igl/segment_segment_intersect.cpp

@@ -1,6 +1,6 @@
 // This file is part of libigl, a simple c++ geometry processing library.
 //
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2016 Francisca Gil Ureta <gilureta@cs.nyu.edu>
 //
 // 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
@@ -63,5 +63,5 @@ IGL_INLINE bool igl::segments_intersect(
 };
 
 #ifdef IGL_STATIC_LIBRARY
-// TODO: Explicit template specialization
-#endif
+template bool igl::segments_intersect<Eigen::Matrix<double, 1, 3, 1, 1, 3>, Eigen::Matrix<double, 1, 3, 1, 1, 3> >(Eigen::PlainObjectBase<Eigen::Matrix<double, 1, 3, 1, 1, 3> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, 1, 3, 1, 1, 3> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, 1, 3, 1, 1, 3> > const&, Eigen::PlainObjectBase<Eigen::Matrix<double, 1, 3, 1, 1, 3> > const&, double&, double&, double);
+#endif

include/igl/segment_segment_intersect.h

@@ -1,6 +1,6 @@
 // This file is part of libigl, a simple c++ geometry processing library.
 //
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2016 Francisca Gil Ureta <gilureta@cs.nyu.edu>
 //
 // 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
@@ -43,4 +43,4 @@ namespace igl
 #ifndef IGL_STATIC_LIBRARY
 #   include "segment_segment_intersect.cpp"
 #endif
-#endif //IGL_SEGMENT_SEGMENT_INTERSECT_H
+#endif //IGL_SEGMENT_SEGMENT_INTERSECT_H

include/igl/streamlines.cpp

@@ -1,3 +1,11 @@
+// This file is part of libigl, a simple c++ geometry processing library.
+//
+// Copyright (C) 2016 Francisca Gil Ureta <gilureta@cs.nyu.edu>
+//
+// 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 "edge_topology.h"
 #include "sort_vectors_ccw.h"
 #include "streamlines.h"
@@ -5,6 +13,8 @@
 #include "polyvector_field_matchings.h"
 #include "segment_segment_intersect.h"
 #include "triangle_triangle_adjacency.h"
+#include "barycenter.h"
+#include "slice.h"
 
 #include <Eigen/Geometry>
 

include/igl/streamlines.h

@@ -1,6 +1,10 @@
+// This file is part of libigl, a simple c++ geometry processing library.
 //
-// Created by Francisca Gil Ureta on 7/1/16.
+// Copyright (C) 2016 Francisca Gil Ureta <gilureta@cs.nyu.edu>
 //
+// 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_STREAMLINES_H
 #define IGL_STREAMLINES_H
@@ -81,4 +85,4 @@ namespace igl
 #  include "streamlines.cpp"
 #endif
 
-#endif
+#endif