diff options
| author | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
|---|---|---|
| committer | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
| commit | 1388d54117ff780b7fadd4fd682b6def569838fa (patch) | |
| tree | 3737760c889eeaf0bd7305becc943d859ae65d96 /src/survive_process.c | |
| parent | 62cef8aec06638bd006eaef46700f491750fc108 (diff) | |
| parent | 9bd0a0d949639b516d28091f57862ac5e59e65da (diff) | |
| download | libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.gz libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.bz2 | |
Merge branch 'master' of github.com:cnlohr/libsurvive
Conflicts:
src/survive_data.c
Diffstat (limited to 'src/survive_process.c')
| -rw-r--r-- | src/survive_process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/survive_process.c b/src/survive_process.c index 2fea99d..8dc849a 100644 --- a/src/survive_process.c +++ b/src/survive_process.c @@ -11,7 +11,6 @@ void survive_default_light_process( SurviveObject * so, int sensor_id, int acode SurviveContext * ctx = so->ctx; int base_station = acode >> 2; int axis = acode & 1; - if( ctx->calptr ) { survive_cal_light( so, sensor_id, acode, timeinsweep, timecode, length ); |