diff options
| author | Keith Packard <keithp@keithp.com> | 2012-12-09 18:33:31 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-12-09 18:33:31 -0800 |
| commit | b26e837a6f18641aae9372aab22168849ff10812 (patch) | |
| tree | c8562489c7aaec44e32f67613c0480c56f9320a9 /src/core | |
| parent | 1489c7f75f7b9ce547ac49c157b440c4f9131ef4 (diff) | |
| parent | c233ef67f42c14cb1d0e0542a9523b279f826af5 (diff) | |
Merge branch 'micropeak-1.1'
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ao_convert_pa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ao_convert_pa.c b/src/core/ao_convert_pa.c index 55fe6e7d..fe6e0ef6 100644 --- a/src/core/ao_convert_pa.c +++ b/src/core/ao_convert_pa.c @@ -43,13 +43,13 @@ ao_pa_to_altitude(int32_t pa) if (pa < 0) pa = 0; - if (pa > 120000) - pa = 120000; + if (pa > 120000L) + pa = 120000L; o = pa >> ALT_SHIFT; part = pa & ALT_MASK; - low = (alt_t) FETCH_ALT(o) * (ALT_SCALE - part); - high = (alt_t) FETCH_ALT(o+1) * part + (ALT_SCALE >> 1); + low = (int32_t) FETCH_ALT(o) * (ALT_SCALE - part); + high = (int32_t) FETCH_ALT(o+1) * part + (ALT_SCALE >> 1); return (low + high) >> ALT_SHIFT; } |