diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-24 15:36:43 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-24 15:36:43 -0700 |
| commit | a279a202768e1cae10f4fb651aad2b3b21db43ab (patch) | |
| tree | 6afc85814095b5e0dc3b1770781cd3cceeb1c39d /src/survive_cal.c | |
| parent | 4dc1d72785c660c206f8def9d8c8aa32289c2709 (diff) | |
| download | libsurvive-a279a202768e1cae10f4fb651aad2b3b21db43ab.tar.gz libsurvive-a279a202768e1cae10f4fb651aad2b3b21db43ab.tar.bz2 | |
remove min()
Diffstat (limited to 'src/survive_cal.c')
| -rwxr-xr-x | src/survive_cal.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/survive_cal.c b/src/survive_cal.c index 6c153b4..5414048 100755 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -141,10 +141,17 @@ void survive_cal_install( struct SurviveContext * ctx ) if (AllowAllTrackersForCal || isRequiredTracker) { - cd->poseobjects[j] = ctx->objs[j]; - cd->numPoseObjects++; + if (MAX_DEVICES_TO_CAL < cd->numPoseObjects) + { + cd->poseobjects[j] = ctx->objs[j]; + cd->numPoseObjects++; - SV_INFO("Calibration is using %s", cd->poseobjects[j]->codename); + SV_INFO("Calibration is using %s", cd->poseobjects[j]->codename); + } + else + { + SV_ERROR("Calibration is NOT using %s; device count exceeds MAX_DEVICES_TO_CAL", cd->poseobjects[j]->codename); + } } } @@ -220,7 +227,7 @@ void survive_cal_light( struct SurviveObject * so, int sensor_id, int acode, int else if( acode < -4 ) break; int lh = (-acode) - 3; - for (int i=0; i < min(MAX_DEVICES_TO_CAL, cd->numPoseObjects); i++) + for (int i=0; i < cd->numPoseObjects; i++) { if( strcmp( so->codename, cd->poseobjects[i]->codename ) == 0 ) { @@ -234,6 +241,7 @@ void survive_cal_light( struct SurviveObject * so, int sensor_id, int acode, int } + } void survive_cal_angle( struct SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle, uint32_t lh ) @@ -245,7 +253,7 @@ void survive_cal_angle( struct SurviveObject * so, int sensor_id, int acode, uin int sensid = sensor_id; - for (int i=0; i < min(MAX_DEVICES_TO_CAL, cd->numPoseObjects); i++) + for (int i=0; i < cd->numPoseObjects; i++) { if( strcmp( so->codename, cd->poseobjects[i]->codename ) == 0 ) { |