mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 22:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Core: cast to the correct type

Browse source 
While in the specific calculations here there isn't really a risk that float
might overflow, it seems odd to cast to float in order to assign to double.

This caused an Alert via LGTM.com

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-03-17 11:35:09 -07:00
parent 412c242c10
commit 47f92b92ac
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/cochran.c
View file

@ -450,23 +450,23 @@ static void cochran_parse_samples(struct dive *dive, const unsigned char *log,
// Get starting depth and temp (tank PSI???) // Get starting depth and temp (tank PSI???)
switch (config.type) { switch (config.type) {
case TYPE_GEMINI: case TYPE_GEMINI:
depth = (float) (log[CMD_START_DEPTH] depth = (double) (log[CMD_START_DEPTH]
+ log[CMD_START_DEPTH + 1] * 256) / 4; + log[CMD_START_DEPTH + 1] * 256) / 4;
temp = log[CMD_START_TEMP]; temp = log[CMD_START_TEMP];
psi = log[CMD_START_PSI] + log[CMD_START_PSI + 1] * 256; psi = log[CMD_START_PSI] + log[CMD_START_PSI + 1] * 256;
sgc_rate = (float)(log[CMD_START_SGC] sgc_rate = (double)(log[CMD_START_SGC]
+ log[CMD_START_SGC + 1] * 256) / 2; + log[CMD_START_SGC + 1] * 256) / 2;
profile_period = log[CMD_PROFILE_PERIOD]; profile_period = log[CMD_PROFILE_PERIOD];
break; break;
case TYPE_COMMANDER: case TYPE_COMMANDER:
depth = (float) (log[CMD_START_DEPTH] depth = (double) (log[CMD_START_DEPTH]
+ log[CMD_START_DEPTH + 1] * 256) / 4; + log[CMD_START_DEPTH + 1] * 256) / 4;
temp = log[CMD_START_TEMP]; temp = log[CMD_START_TEMP];
profile_period = log[CMD_PROFILE_PERIOD]; profile_period = log[CMD_PROFILE_PERIOD];
break; break;
case TYPE_EMC: case TYPE_EMC:
depth = (float) log [EMC_START_DEPTH] / 256 depth = (double) log [EMC_START_DEPTH] / 256
+ log[EMC_START_DEPTH + 1]; + log[EMC_START_DEPTH + 1];
temp = log[EMC_START_TEMP]; temp = log[EMC_START_TEMP];
profile_period = log[EMC_PROFILE_PERIOD]; profile_period = log[EMC_PROFILE_PERIOD];
@ -503,7 +503,7 @@ static void cochran_parse_samples(struct dive *dive, const unsigned char *log,
} }
// Depth is in every sample // Depth is in every sample
depth_sample = (float)(s[0] & 0x3F) / 4 * (s[0] & 0x40 ? -1 : 1); depth_sample = (double)(s[0] & 0x3F) / 4 * (s[0] & 0x40 ? -1 : 1);
depth += depth_sample; depth += depth_sample;
#ifdef COCHRAN_DEBUG #ifdef COCHRAN_DEBUG
@ -528,13 +528,13 @@ static void cochran_parse_samples(struct dive *dive, const unsigned char *log,
ascent_rate = (s[1] & 0x7f) * (s[1] & 0x80 ? 1 : -1); ascent_rate = (s[1] & 0x7f) * (s[1] & 0x80 ? 1 : -1);
break; break;
case 2: // PSI change case 2: // PSI change
psi -= (float)(s[1] & 0x7f) * (s[1] & 0x80 ? 1 : -1) / 4; psi -= (double)(s[1] & 0x7f) * (s[1] & 0x80 ? 1 : -1) / 4;
break; break;
case 1: // SGC rate case 1: // SGC rate
sgc_rate -= (float)(s[1] & 0x7f) * (s[1] & 0x80 ? 1 : -1) / 2; sgc_rate -= (double)(s[1] & 0x7f) * (s[1] & 0x80 ? 1 : -1) / 2;
break; break;
case 3: // Temperature case 3: // Temperature
temp = (float)s[1] / 2 + 20; temp = (double)s[1] / 2 + 20;
break; break;
} }
break; break;
@ -544,7 +544,7 @@ static void cochran_parse_samples(struct dive *dive, const unsigned char *log,
ascent_rate = (s[1] & 0x7f) * (s[1] & 0x80 ? 1: -1); ascent_rate = (s[1] & 0x7f) * (s[1] & 0x80 ? 1: -1);
break; break;
case 1: // Temperature case 1: // Temperature
temp = (float)s[1] / 2 + 20; temp = (double)s[1] / 2 + 20;
break; break;
} }
// Get NDL and deco information // Get NDL and deco information