Package: meshlab / 1.3.2+dfsg1-4

gcc-7.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Description: Fix FTBFS with GCC 7
Bug-Debian: https://bugs.debian.org/853545
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2017-08-08
--- a/vcglib/wrap/io_trimesh/import_out.h
+++ b/vcglib/wrap/io_trimesh/import_out.h
@@ -85,10 +85,10 @@
     return true;
 }
 
-static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
+static bool ReadHeader(const char * filename,unsigned int &num_cams, unsigned int &num_points){
 	FILE *fp = fopen(filename, "r");
 	if(!fp) return false;
-	ReadHeader(fp);
+	ReadHeader(fp, num_cams, num_points);
 	fclose(fp);
 	return true;
 }
--- a/vcglib/vcg/complex/algorithms/create/resampler.h
+++ b/vcglib/vcg/complex/algorithms/create/resampler.h
@@ -253,7 +253,7 @@
 		*/
 		void ComputeConsensus(int slice, field_value *slice_values)
 		{
-			float max_dist = min(min(this->voxel[0],this->voxel[1]),this->voxel[2]);
+			float max_dist = std::min(std::min(this->voxel[0],this->voxel[1]),this->voxel[2]);
 			int flippedCnt=0;
 			int flippedTot=0;
 			int flippedTimes=0;