Fix erroneous merge-conflict resolution in integer bilinear resize, interpolation should be of type T
This commit is contained in:
parent
cf9df0c1df
commit
ea14a9ae1e
@ -1745,8 +1745,8 @@ inline void ResizeBilinearInteger(
|
|||||||
const int64_t output_20 =
|
const int64_t output_20 =
|
||||||
output_20_ll + output_20_lu + output_20_rl + output_20_ru;
|
output_20_ll + output_20_lu + output_20_rl + output_20_ru;
|
||||||
const int64_t round = (output_20 > 0) ? (1 << 19) : -(1 << 19);
|
const int64_t round = (output_20 > 0) ? (1 << 19) : -(1 << 19);
|
||||||
const int8_t interpolation =
|
const T interpolation =
|
||||||
static_cast<int8_t>((output_20 + round) / (1 << 20));
|
static_cast<T>((output_20 + round) / (1 << 20));
|
||||||
output_data[Offset(output_shape, b, y, x, c)] = interpolation;
|
output_data[Offset(output_shape, b, y, x, c)] = interpolation;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user