Small changes needed for Windows compilation.
This commit is contained in:
parent
121af6278b
commit
1386b1dd20
1 changed files with 2 additions and 1 deletions
|
@ -21,6 +21,7 @@
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
|
const unsigned char BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
|
||||||
|
|
||||||
|
@ -72,7 +73,7 @@ void CNXDNConvolution::decode(uint8_t s0, uint8_t s1)
|
||||||
for (uint8_t i = 0U; i < NUM_OF_STATES_D2; i++) {
|
for (uint8_t i = 0U; i < NUM_OF_STATES_D2; i++) {
|
||||||
uint8_t j = i * 2U;
|
uint8_t j = i * 2U;
|
||||||
|
|
||||||
uint16_t metric = abs(BRANCH_TABLE1[i] - s0) + abs(BRANCH_TABLE2[i] - s1);
|
uint16_t metric = ::abs(BRANCH_TABLE1[i] - s0) + ::abs(BRANCH_TABLE2[i] - s1);
|
||||||
|
|
||||||
uint16_t m0 = m_oldMetrics[i] + metric;
|
uint16_t m0 = m_oldMetrics[i] + metric;
|
||||||
uint16_t m1 = m_oldMetrics[i + NUM_OF_STATES_D2] + (M - metric);
|
uint16_t m1 = m_oldMetrics[i + NUM_OF_STATES_D2] + (M - metric);
|
||||||
|
|
Loading…
Reference in a new issue