Upgrade to 1.3.3 and define LICENSE.

8 files changed, 89 insertions, 80 deletions

diff --git a/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp b/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp
new file mode 100644
index 000000000000..fdfe5a8120f9
--- /dev/null
+++ b/cad/meshlab/files/patch-external-structuresynth-1.5-ssynth-SyntopiaCore-GLEngine-Raytracer-VoxelStepper.cpp
@@ -0,0 +1,11 @@
+--- external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp.orig	2014-02-07 10:38:23.000000000 +0100
++++ external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp	2015-01-25 18:58:54.000000000 +0100
+@@ -122,7 +122,7 @@
+ 						currentT = p;
+ 
+ 						// We do not intersect grid.
+-						if (!found) return false;
++						if (!found) return nullptr;
+ 				}
+ 
+ 				stepX = (dir.x() > 0) ? 1 : -1;
diff --git a/cad/meshlab/files/patch-meshlab_mainwindow_RunTime.cpp b/cad/meshlab/files/patch-meshlab_mainwindow_RunTime.cpp
deleted file mode 100644
index 7f8d43a65537..000000000000
--- a/cad/meshlab/files/patch-meshlab_mainwindow_RunTime.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- meshlab/mainwindow_RunTime.cpp.orig	2013-10-31 16:02:53.000000000 +0100
-+++ meshlab/mainwindow_RunTime.cpp	2013-10-31 16:04:13.000000000 +0100
-@@ -1575,7 +1575,9 @@
- 
-   /*********WARNING!!!!!! CHANGE IT!!! ALSO IN THE OPENPROJECT FUNCTION********/
-   meshDoc()->setDocLabel(fileName);
--  mdiarea->activeSubWindow()->setWindowTitle(meshDoc()->docLabel());
-+  if (mdiarea->activeSubWindow()) {
-+      mdiarea->activeSubWindow()->setWindowTitle(meshDoc()->docLabel());
-+  }
-   layerDialog->setWindowTitle(meshDoc()->docLabel());
-   /****************************************************************************/
- 
diff --git a/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h b/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h
index 633d5e67a962..8662f077f095 100644
--- a/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h
+++ b/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h
@@ -1,12 +1,12 @@
---- ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h.orig	2013-11-16 22:04:41.000000000 +0100
-+++ ../../meshlab/src/meshlabplugins/decorate_base/colorhistogram.h	2013-11-16 22:04:56.000000000 +0100
+--- meshlabplugins/decorate_base/colorhistogram.h.orig	2013-07-17 17:20:11.000000000 +0200
++++ meshlabplugins/decorate_base/colorhistogram.h	2015-01-24 18:01:12.000000000 +0100
 @@ -39,10 +39,11 @@
    //ScalarType BinWidth(ScalarType v);
  
    //! Reset histogram data.
 +  /* dead code
    void Clear() {
-     this->::Clear();
+     Histogram<ScalarType>::Clear();
      CV.clear();
 -  }
 +  } */
diff --git a/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h b/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h
new file mode 100644
index 000000000000..e9ab3087f292
--- /dev/null
+++ b/cad/meshlab/files/patch-meshlabplugins-filter_csg-intercept.h
@@ -0,0 +1,58 @@
+--- meshlabplugins/filter_csg/intercept.h.orig	2015-01-25 21:48:25.000000000 +0100
++++ meshlabplugins/filter_csg/intercept.h	2015-01-25 21:49:09.000000000 +0100
+@@ -7,8 +7,13 @@
+     #include <unordered_map>
+     #include <unordered_set>
+ #else
++#   if !defined(_LIBCPP_VERSION)
+     #include <tr1/unordered_map>
+     #include <tr1/unordered_set>
++#   else
++    #include <unordered_map>
++    #include <unordered_set>
++#   endif
+ #endif
+ 
+ #include <vcg/complex/complex.h>
+@@ -29,7 +34,7 @@
+ //MSVC++ 7.0  _MSC_VER = 1300
+ //MSVC++ 6.0  _MSC_VER = 1200
+ //MSVC++ 5.0  _MSC_VER = 1100
+-#if defined(_MSC_VER) && (_MSC_VER > 1500)
++#if (defined(_MSC_VER) && (_MSC_VER > 1500)) || defined(_LIBCPP_VERSION)
+ #else
+ 	 namespace tr1 {
+ #endif
+@@ -38,11 +43,15 @@
+         {
+             std::size_t operator()(const vcg::Point3i &x) const
+             {
++#if !defined(_LIBCPP_VERSION)
+                 std::tr1::hash<int> h;
++#else
++                std::hash<int> h;
++#endif
+                 return ((x[0]) * 131 + h(x[1])) * 131 + h(x[2]);
+             }
+         };
+-#if defined(_MSC_VER) && (_MSC_VER > 1500)
++#if (defined(_MSC_VER) && (_MSC_VER > 1500)) || defined(_LIBCPP_VERSION)
+ #else
+ 	 }
+ #endif       
+@@ -823,9 +832,15 @@
+         {
+             typedef typename MeshType::VertexPointer VertexPointer;
+             typedef typename MeshType::CoordType CoordType;
++#if !defined(_LIBCPP_VERSION)
+             typedef typename std::tr1::unordered_map<const InterceptType*,size_t> VertexTable;
+             typedef typename std::tr1::unordered_map<vcg::Point3i,float> SamplesTable;
+             typedef typename std::tr1::unordered_set<vcg::Point3i> CellsSet;
++#else
++            typedef typename std::unordered_map<const InterceptType*,size_t> VertexTable;
++            typedef typename std::unordered_map<vcg::Point3i,float> SamplesTable;
++            typedef typename std::unordered_set<vcg::Point3i> CellsSet;
++#endif
+ 
+             void clear() {
+                 _vertices.clear();
diff --git a/cad/meshlab/files/patch-vcglib-vcg-complex-algorithms_subset.h b/cad/meshlab/files/patch-vcglib-vcg-complex-algorithms_subset.h
deleted file mode 100644
index a7b1290e93d3..000000000000
--- a/cad/meshlab/files/patch-vcglib-vcg-complex-algorithms_subset.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../../vcglib/vcg/complex/algorithms/subset.h.orig	2013-10-31 09:34:59.000000000 +0100
-+++ ../../vcglib/vcg/complex/algorithms/subset.h	2013-10-31 09:35:06.000000000 +0100
-@@ -86,12 +86,12 @@
-     return (v<o.v);
-   }
-   
--  bool operator ==(const InsertedV & o)
-+  bool operator ==(const InsertedV & o) const
-   {
-     return (v==o.v);
-   }
-   
--  bool operator !=(const InsertedV & o)
-+  bool operator !=(const InsertedV & o) const
-   {
-     return (v!=o.v);
-   }
diff --git a/cad/meshlab/files/patch-vcglib-vcg-math_base.h b/cad/meshlab/files/patch-vcglib-vcg-math_base.h
deleted file mode 100644
index 1a7a65d64d6f..000000000000
--- a/cad/meshlab/files/patch-vcglib-vcg-math_base.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../../vcglib/vcg/math/base.h.orig	2012-04-05 11:04:15.000000000 +0200
-+++ ../../vcglib/vcg/math/base.h	2013-10-31 11:09:34.000000000 +0100
-@@ -94,7 +94,9 @@
- /// static_assert: implemented as a macro for "assert", but it is separated for clarity.
- /// Should be used for checking integrity constraints that can be tested at complile time,
- /// as the ones involving templated constants in templated classes.
-+#if 0
- #define static_assert assert
-+#endif
- 
-   #ifdef __BORLANDC__
-     float sqrtf (float v) {return sqrt(v);}
diff --git a/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h b/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h
index a5ac6a15107e..220bf6713507 100644
--- a/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h
+++ b/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h
@@ -1,5 +1,5 @@
---- ../../vcglib/vcg/space/deprecated_point.h.orig	2012-07-31 08:25:21.000000000 +0200
-+++ ../../vcglib/vcg/space/deprecated_point.h	2014-06-10 17:19:15.000000000 +0200
+--- ../../vcglib/vcg/space/deprecated_point.h.orig	2014-04-01 17:10:03.000000000 +0200
++++ ../../vcglib/vcg/space/deprecated_point.h	2015-01-24 23:55:25.000000000 +0100
 @@ -59,6 +59,10 @@
  #include <vcg/math/base.h>
  #include <vcg/space/space.h>
@@ -10,21 +10,21 @@
 +
  namespace vcg {
  
- 	namespace ndim{
+     namespace ndim{
 @@ -164,14 +168,14 @@
  	}
    inline const S &X() const { return _v[0]; }
- 	inline const S &Y() const { return _v[1]; }
--	inline const S &Z() const { static_assert(N>2); return _v[2]; }
-+	inline const S &Z() const { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
- 	 /// W is in any case the last coordinate.
- 	 /// (in a 2D point, W() == Y(). In a 3D point, W()==Z()
- 	 ///  in a 4D point, W() is a separate component)
- 	inline const S &W() const { return _v[N-1]; }
- 	inline S &X() { return _v[0]; }
- 	inline S &Y() { return _v[1]; }
--	inline S &Z() { static_assert(N>2); return _v[2]; }
-+	inline S &Z() { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
- 	inline S &W() { return _v[N-1]; }
- 	inline const S * V() const
- 	{
+     inline const S &Y() const { return _v[1]; }
+-    inline const S &Z() const { static_assert(N>2); return _v[2]; }
++    inline const S &Z() const { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
+      /// W is in any case the last coordinate.
+      /// (in a 2D point, W() == Y(). In a 3D point, W()==Z()
+      ///  in a 4D point, W() is a separate component)
+     inline const S &W() const { return _v[N-1]; }
+     inline S &X() { return _v[0]; }
+     inline S &Y() { return _v[1]; }
+-    inline S &Z() { static_assert(N>2); return _v[2]; }
++    inline S &Z() { static_assert(N>2, "No Z coordinate in R² space"); return _v[2]; }
+     inline S &W() { return _v[N-1]; }
+     inline const S * V() const
+     {
diff --git a/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h b/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h
deleted file mode 100644
index 56e36789e70d..000000000000
--- a/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../../vcglib/wrap/gl/trimesh.h.orig	2013-11-16 21:32:47.000000000 +0100
-+++ ../../vcglib/wrap/gl/trimesh.h	2013-11-16 21:33:23.000000000 +0100
-@@ -895,6 +895,7 @@
- #define VCTRACE (void)0
- //#define VCTRACE TRACE
- 
-+/* dead code
- template<class MESH_TYPE>
- void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
- {
-@@ -1006,6 +1007,7 @@
- 	m.vert.math::Swap(newvert);
- 	m.vn=m.vert.size();
- }
-+*/
- 
- /*
- 	Secondo tipo di crease angle. ha bisogno del per wedge normal