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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 23 Jan 2016 15:56:22 +0100
Subject: Fix GCC6 compilation
* Ignore Warray-bounds
* Rename equivalent to fix compilation on gcc6
* Fix -Werror=misleading-indentation
---
Source/Drivers/PS1080/Formats/XnFormatsMirror.cpp | 3 ++
ThirdParty/GL/glh/glh_glut2.h | 2 +-
ThirdParty/GL/glh/glh_linear.h | 66 +++++++++++------------
3 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/Source/Drivers/PS1080/Formats/XnFormatsMirror.cpp b/Source/Drivers/PS1080/Formats/XnFormatsMirror.cpp
index 120534c..7759333 100644
--- a/Source/Drivers/PS1080/Formats/XnFormatsMirror.cpp
+++ b/Source/Drivers/PS1080/Formats/XnFormatsMirror.cpp
@@ -26,6 +26,8 @@
#include "XnFormats.h"
#include <XnOS.h>
#include <XnLog.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
//---------------------------------------------------------------------------
// Defines
@@ -240,3 +242,4 @@ XnStatus XnFormatsMirrorPixelData(OniPixelFormat nOutputFormat, XnUChar* pBuffer
return XN_STATUS_ERROR;
}
}
+#pragma GCC diagnostic pop
diff --git a/ThirdParty/GL/glh/glh_glut2.h b/ThirdParty/GL/glh/glh_glut2.h
index 908a0fc..0430698 100644
--- a/ThirdParty/GL/glh/glh_glut2.h
+++ b/ThirdParty/GL/glh/glh_glut2.h
@@ -190,7 +190,7 @@ namespace glh
{
if (interactors.empty())
return;
- std::list<glut_interactor *>::iterator it =
+ std::list<glut_interactor *>::iterator it =
std::find(interactors.begin(), interactors.end(), gi);
if(it != interactors.end())
interactors.erase(it);
diff --git a/ThirdParty/GL/glh/glh_linear.h b/ThirdParty/GL/glh/glh_linear.h
index 422c05f..2e033ba 100644
--- a/ThirdParty/GL/glh/glh_linear.h
+++ b/ThirdParty/GL/glh/glh_linear.h
@@ -77,7 +77,7 @@ glh_linear.h
#define GLH_EPSILON GLH_REAL(10e-6)
#define GLH_PI GLH_REAL(3.1415926535897932384626433832795)
-#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
+#define glh_equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
namespace glh
{
@@ -225,7 +225,7 @@ namespace glh
for(int i = 0; i < N; i++)
if(v1.v[i] != v2.v[i])
return false;
- return true;
+ return true;
}
template <int N, class T> inline
@@ -633,7 +633,7 @@ namespace glh
scp[i] = real(fabs(s[i][0]));
for(j=1;j<4;j++)
if(real(fabs(s[i][j])) > scp[i]) scp[i] = real(fabs(s[i][j]));
- if(scp[i] == 0.0) return minv; // singular matrix!
+ if(scp[i] == 0.0) return minv; // singular matrix!
}
int pivot_to;
@@ -647,26 +647,26 @@ namespace glh
for(p=i+1;p<4;p++)
if(real(fabs(s[p][i]/scp[p])) > scp_max)
{ scp_max = real(fabs(s[p][i]/scp[p])); pivot_to = p; }
- // Pivot if necessary
- if(pivot_to != i)
- {
- tmprow = s[i];
- s[i] = s[pivot_to];
- s[pivot_to] = tmprow;
- real tmpscp;
- tmpscp = scp[i];
- scp[i] = scp[pivot_to];
- scp[pivot_to] = tmpscp;
- }
-
- real mji;
- // perform gaussian elimination
- for(j=i+1;j<4;j++)
- {
- mji = s[j][i]/s[i][i];
- s[j][i] = 0.0;
- for(jj=i+1;jj<8;jj++)
- s[j][jj] -= mji*s[i][jj];
+ // Pivot if necessary
+ if(pivot_to != i)
+ {
+ tmprow = s[i];
+ s[i] = s[pivot_to];
+ s[pivot_to] = tmprow;
+ real tmpscp;
+ tmpscp = scp[i];
+ scp[i] = scp[pivot_to];
+ scp[pivot_to] = tmpscp;
+ }
+
+ real mji;
+ // perform gaussian elimination
+ for(j=i+1;j<4;j++)
+ {
+ mji = s[j][i]/s[i][i];
+ s[j][i] = 0.0;
+ for(jj=i+1;jj<8;jj++)
+ s[j][jj] -= mji*s[i][jj];
}
}
if(s[3][3] == 0.0) return minv; // singular matrix!
@@ -702,7 +702,7 @@ namespace glh
for(j=0;j<4;j++)
minv(i,j) = s[i][j+4] / s[i][i];
- return minv;
+ return minv;
}
@@ -1093,7 +1093,7 @@ namespace glh
real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
- s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
+ s = (glh_equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
xs = q[0] * s;
ys = q[1] * s;
@@ -1194,7 +1194,7 @@ namespace glh
theta *= real(0.5);
real sin_theta = real(sin(theta));
- if (!equivalent(sqnorm,GLH_ONE))
+ if (!glh_equivalent(sqnorm,GLH_ONE))
sin_theta /= real(sqrt(sqnorm));
x = sin_theta * axis.v[0];
y = sin_theta * axis.v[1];
@@ -1216,14 +1216,14 @@ namespace glh
alpha = p1.dot(p2);
- if(equivalent(alpha,GLH_ONE))
+ if(glh_equivalent(alpha,GLH_ONE))
{
*this = identity();
return *this;
}
// ensures that the anti-parallel case leads to a positive dot
- if(equivalent(alpha,-GLH_ONE))
+ if(glh_equivalent(alpha,-GLH_ONE))
{
vec3 v;
@@ -1280,7 +1280,7 @@ namespace glh
void normalize()
{
real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
- if (equivalent(rnorm, GLH_ZERO))
+ if (glh_equivalent(rnorm, GLH_ZERO))
return;
x *= rnorm;
y *= rnorm;
@@ -1439,10 +1439,10 @@ namespace glh
inline
bool operator == ( const quaternion & q1, const quaternion & q2 )
{
- return (equivalent(q1.x, q2.x) &&
- equivalent(q1.y, q2.y) &&
- equivalent(q1.z, q2.z) &&
- equivalent(q1.w, q2.w) );
+ return (glh_equivalent(q1.x, q2.x) &&
+ glh_equivalent(q1.y, q2.y) &&
+ glh_equivalent(q1.z, q2.z) &&
+ glh_equivalent(q1.w, q2.w) );
}
inline
|
