aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristoph Haag <haagch@frickel.club>2018-01-15 17:10:55 +0100
committerChristoph Haag <haagch@frickel.club>2018-01-15 17:12:40 +0100
commitc570809ce1d1cc1d30ef4db547e6388b3fd80ac1 (patch)
treef293b454dceec027a67b9e670c1c2708e862c438 /src
parent91fc90bf9171fe588fd11492bdae7419d5ccd921 (diff)
downloadlibsurvive-c570809ce1d1cc1d30ef4db547e6388b3fd80ac1.tar.gz
libsurvive-c570809ce1d1cc1d30ef4db547e6388b3fd80ac1.tar.bz2
fix various -Wall warnings
Diffstat (limited to 'src')
-rw-r--r--src/poser_octavioradii.c6
-rwxr-xr-xsrc/survive.c2
-rwxr-xr-xsrc/survive_vive.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/poser_octavioradii.c b/src/poser_octavioradii.c
index 0d8674c..be1e9f7 100644
--- a/src/poser_octavioradii.c
+++ b/src/poser_octavioradii.c
@@ -252,7 +252,7 @@ static void normalizeAndMultiplyVector(FLT *vectorToNormalize, size_t count, FLT
}
-static RefineEstimateUsingGradientDescentRadii(FLT *estimateOut, SensorAngles *angles, FLT *initialEstimate, size_t numRadii, PointPair *pairs, size_t numPairs, FILE *logFile)
+static void RefineEstimateUsingGradientDescentRadii(FLT *estimateOut, SensorAngles *angles, FLT *initialEstimate, size_t numRadii, PointPair *pairs, size_t numPairs, FILE *logFile)
{
int i = 0;
FLT lastMatchFitness = calculateFitness(angles, initialEstimate, pairs, numPairs);
@@ -521,9 +521,9 @@ static void QuickPose(SurviveObject *so)
if (sensorCount > 4)
{
- FLT pos[3];
+ Point pos;
FLT orient[4];
- SolveForLighthouseRadii(pos, orient, to);
+ SolveForLighthouseRadii(&pos, orient, to);
}
diff --git a/src/survive.c b/src/survive.c
index 1c406e8..a5ca68f 100755
--- a/src/survive.c
+++ b/src/survive.c
@@ -182,7 +182,7 @@ SurviveContext * survive_init( int headless )
ctx->buttonQueue.buttonservicesem = OGCreateSema();
// start the thread to process button data
- ctx->buttonservicethread = OGCreateThread(button_servicer, ctx);
+ ctx->buttonservicethread = OGCreateThread(&button_servicer, ctx);
survive_install_button_fn(ctx, NULL);
survive_install_raw_pose_fn(ctx, NULL);
diff --git a/src/survive_vive.c b/src/survive_vive.c
index 65636cf..934b5d3 100755
--- a/src/survive_vive.c
+++ b/src/survive_vive.c
@@ -309,8 +309,8 @@ static inline int getupdate_feature_report(libusb_device_handle* dev, uint16_t i
int ret = libusb_control_transfer(dev, LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE | LIBUSB_ENDPOINT_IN,
0x01, 0x300 | data[0], interface, data, datalen, 1000 );
if( ret == -9 ) return -9;
- if (ret < 0)
- return -1;
+ if (ret < 0)
+ return -1;
return ret;
}