Skip to content

Commit 058315d

Browse files
committed
Fixup indentation after cherry-pick.
Signed-off-by: Benn Snyder <[email protected]>
1 parent 5a45be5 commit 058315d

File tree

1 file changed

+38
-41
lines changed

1 file changed

+38
-41
lines changed

OpenNI2-FreenectDriver/src/DepthStream.hpp

+38-41
Original file line numberDiff line numberDiff line change
@@ -210,55 +210,52 @@ namespace FreenectDriver
210210

211211
void notifyAllProperties()
212212
{
213-
214213
double nDouble;
215-
int size = sizeof(nDouble);
216-
217-
getProperty(XN_STREAM_PROPERTY_EMITTER_DCMOS_DISTANCE, &nDouble, &size);
218-
raisePropertyChanged(XN_STREAM_PROPERTY_EMITTER_DCMOS_DISTANCE, &nDouble, size);
214+
int size = sizeof(nDouble);
219215

216+
getProperty(XN_STREAM_PROPERTY_EMITTER_DCMOS_DISTANCE, &nDouble, &size);
217+
raisePropertyChanged(XN_STREAM_PROPERTY_EMITTER_DCMOS_DISTANCE, &nDouble, size);
220218

221-
unsigned long long nUll;
222-
size = sizeof(nUll);
223-
getProperty(XN_STREAM_PROPERTY_ZERO_PLANE_PIXEL_SIZE, &nUll, &size);
224-
raisePropertyChanged(XN_STREAM_PROPERTY_ZERO_PLANE_PIXEL_SIZE, &nUll, size);
219+
unsigned long long nUll;
220+
size = sizeof(nUll);
221+
getProperty(XN_STREAM_PROPERTY_ZERO_PLANE_PIXEL_SIZE, &nUll, &size);
222+
raisePropertyChanged(XN_STREAM_PROPERTY_ZERO_PLANE_PIXEL_SIZE, &nUll, size);
225223

226-
getProperty(XN_STREAM_PROPERTY_GAIN, &nUll, &size);
227-
raisePropertyChanged(XN_STREAM_PROPERTY_GAIN, &nUll, size);
228-
229-
getProperty(XN_STREAM_PROPERTY_CONST_SHIFT, &nUll, &size);
230-
raisePropertyChanged(XN_STREAM_PROPERTY_CONST_SHIFT, &nUll, size);
231-
232-
getProperty(XN_STREAM_PROPERTY_MAX_SHIFT, &nUll, &size);
233-
raisePropertyChanged(XN_STREAM_PROPERTY_MAX_SHIFT, &nUll, size);
234-
235-
getProperty(XN_STREAM_PROPERTY_SHIFT_SCALE, &nUll, &size);
236-
raisePropertyChanged(XN_STREAM_PROPERTY_SHIFT_SCALE, &nUll, size);
237-
238-
getProperty(XN_STREAM_PROPERTY_ZERO_PLANE_DISTANCE, &nUll, &size);
239-
raisePropertyChanged(XN_STREAM_PROPERTY_ZERO_PLANE_DISTANCE, &nUll, size);
240-
241-
getProperty(XN_STREAM_PROPERTY_PARAM_COEFF, &nUll, &size);
242-
raisePropertyChanged(XN_STREAM_PROPERTY_PARAM_COEFF, &nUll, size);
243-
244-
int nInt;
245-
size = sizeof(nInt);
224+
getProperty(XN_STREAM_PROPERTY_GAIN, &nUll, &size);
225+
raisePropertyChanged(XN_STREAM_PROPERTY_GAIN, &nUll, size);
246226

227+
getProperty(XN_STREAM_PROPERTY_CONST_SHIFT, &nUll, &size);
228+
raisePropertyChanged(XN_STREAM_PROPERTY_CONST_SHIFT, &nUll, size);
247229

248-
getProperty(ONI_STREAM_PROPERTY_MAX_VALUE, &nInt, &size);
249-
raisePropertyChanged(ONI_STREAM_PROPERTY_MAX_VALUE, &nInt, size);
230+
getProperty(XN_STREAM_PROPERTY_MAX_SHIFT, &nUll, &size);
231+
raisePropertyChanged(XN_STREAM_PROPERTY_MAX_SHIFT, &nUll, size);
250232

251-
unsigned short nBuff[10001];
252-
size = sizeof(S2D);
253-
getProperty(XN_STREAM_PROPERTY_S2D_TABLE, nBuff, &size);
254-
raisePropertyChanged(XN_STREAM_PROPERTY_S2D_TABLE, nBuff, size);
255-
256-
size = sizeof(D2S);
257-
getProperty(XN_STREAM_PROPERTY_D2S_TABLE, nBuff, &size);
258-
raisePropertyChanged(XN_STREAM_PROPERTY_D2S_TABLE, nBuff, size);
259-
VideoStream::notifyAllProperties();
260-
}
233+
getProperty(XN_STREAM_PROPERTY_SHIFT_SCALE, &nUll, &size);
234+
raisePropertyChanged(XN_STREAM_PROPERTY_SHIFT_SCALE, &nUll, size);
235+
236+
getProperty(XN_STREAM_PROPERTY_ZERO_PLANE_DISTANCE, &nUll, &size);
237+
raisePropertyChanged(XN_STREAM_PROPERTY_ZERO_PLANE_DISTANCE, &nUll, size);
238+
239+
getProperty(XN_STREAM_PROPERTY_PARAM_COEFF, &nUll, &size);
240+
raisePropertyChanged(XN_STREAM_PROPERTY_PARAM_COEFF, &nUll, size);
241+
242+
int nInt;
243+
size = sizeof(nInt);
261244

245+
getProperty(ONI_STREAM_PROPERTY_MAX_VALUE, &nInt, &size);
246+
raisePropertyChanged(ONI_STREAM_PROPERTY_MAX_VALUE, &nInt, size);
247+
248+
unsigned short nBuff[10001];
249+
size = sizeof(S2D);
250+
getProperty(XN_STREAM_PROPERTY_S2D_TABLE, nBuff, &size);
251+
raisePropertyChanged(XN_STREAM_PROPERTY_S2D_TABLE, nBuff, size);
252+
253+
size = sizeof(D2S);
254+
getProperty(XN_STREAM_PROPERTY_D2S_TABLE, nBuff, &size);
255+
raisePropertyChanged(XN_STREAM_PROPERTY_D2S_TABLE, nBuff, size);
256+
257+
VideoStream::notifyAllProperties();
258+
}
262259

263260
};
264261
}

0 commit comments

Comments
 (0)