diff options
| author | mat <mat@FreeBSD.org> | 2014-01-08 06:48:05 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2014-01-08 06:48:05 +0800 |
| commit | 2f2faaf17e3993701348363cf0a3fa4d1deac843 (patch) | |
| tree | 91d029c9cd5c16625a131c80fcbaa68bc1b8d61c /cad | |
| parent | 22b148800696b52afb99ba8a1ef5039fc74eed4c (diff) | |
| download | freebsd-ports-gnome-2f2faaf17e3993701348363cf0a3fa4d1deac843.tar.gz freebsd-ports-gnome-2f2faaf17e3993701348363cf0a3fa4d1deac843.tar.zst freebsd-ports-gnome-2f2faaf17e3993701348363cf0a3fa4d1deac843.zip | |
Fix build with gcc47
PR: ports/184565
Submitted by: Christoph Moench-Tegeder
Approved by: maintainer
Diffstat (limited to 'cad')
3 files changed, 33 insertions, 19 deletions
diff --git a/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h b/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h new file mode 100644 index 000000000000..633d5e67a962 --- /dev/null +++ b/cad/meshlab/files/patch-meshlabplugins-decorate_base-colorhistogram.h @@ -0,0 +1,15 @@ +--- ../../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 +@@ -39,10 +39,11 @@ + //ScalarType BinWidth(ScalarType v); + + //! Reset histogram data. ++ /* dead code + void Clear() { + this->::Clear(); + CV.clear(); +- } ++ } */ + /* + Note that the histogram holds <n> valid bins plus two semi-infinite bins. + diff --git a/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h b/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h deleted file mode 100644 index 9c97c60fd15a..000000000000 --- a/cad/meshlab/files/patch-vcglib-vcg-space_deprecated_point.h +++ /dev/null @@ -1,19 +0,0 @@ ---- ../../vcglib/vcg/space/deprecated_point.h.orig 2013-10-30 18:12:59.000000000 +0100 -+++ ../../vcglib/vcg/space/deprecated_point.h 2013-10-30 18:12:33.000000000 +0100 -@@ -164,14 +164,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, ""); 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, ""); 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 new file mode 100644 index 000000000000..56e36789e70d --- /dev/null +++ b/cad/meshlab/files/patch-vcglib-wrap-gl-trimesh.h @@ -0,0 +1,18 @@ +--- ../../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 |