mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 19:33:03 +00:00
b12b180fc2
Patches are from the Arch Linux package.
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
|
|
index 2351b2a..90c6d76 100644
|
|
--- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
|
|
+++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
|
|
@@ -40,7 +40,7 @@ public:
|
|
|
|
//! Reset histogram data.
|
|
void Clear() {
|
|
- this->::Clear();
|
|
+ Histogram<ScalarType>::Clear();
|
|
CV.clear();
|
|
}
|
|
/*
|
|
diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
|
|
index 5d40404..ab9d0aa 100644
|
|
--- a/vcglib/wrap/gl/trimesh.h
|
|
+++ b/vcglib/wrap/gl/trimesh.h
|
|
@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
|
|
}
|
|
}
|
|
|
|
- m.vert.math::Swap(newvert);
|
|
+ m.vert.math.Swap(newvert);
|
|
m.vn=m.vert.size();
|
|
}
|
|
|
|
diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
|
|
index 3e41e63..4af9508 100644
|
|
--- a/vcglib/wrap/ply/plystuff.h
|
|
+++ b/vcglib/wrap/ply/plystuff.h
|
|
@@ -75,6 +75,7 @@ using namespace vcg;
|
|
#define pb_close _close
|
|
#define DIR_SEP "\\"
|
|
#else
|
|
+#include <unistd.h>
|
|
#define pb_mkdir(n) mkdir(n,0755)
|
|
#define pb_access access
|
|
#define pb_stat stat
|