AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10273 fix Windows test failure in FixedDecimal.

Browse Source 
X-SVN-Rev: 34308
This commit is contained in:
Andy Heninger 2013-09-13 17:08:58 +00:00
parent 0c1b6a8ffd
commit b6529f6c53
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
icu4c/source/i18n/decimfmt.cpp
View File

@ -1069,11 +1069,22 @@ DecimalFormat::getFixedDecimal(const Formattable &number, UErrorCode &status) co
}
Formattable::Type type = number.getType();
if (type == Formattable::kDouble || type == Formattable::kLong ||
(type == Formattable::kInt64 && number.getInt64() == (int64_t)number.getDouble(status))) {
if (type == Formattable::kDouble || type == Formattable::kLong) {
return getFixedDecimal(number.getDouble(status), status);
}
if (type == Formattable::kInt64) {
double fdv = number.getDouble(status);
// Note: conversion of int64_t -> double rounds with some compilers to
// values beyond what can be represented as a 64 bit int. Subsequent
// testing or conversion with int64_t produces bad results.
// So filter the problematic values, route them to DigitList.
if (fdv != (double)U_INT64_MAX && fdv != (double)U_INT64_MIN &&
number.getInt64() == (int64_t)fdv) {
return getFixedDecimal(number.getDouble(status), status);
}
}
// The only case left is type==int64_t, with a value with more digits than a double can represent.
// Any formattable originating as a big decimal will have had a pre-existing digit list.
// Any originating as a double or int32 will have been handled as a double.

2
icu4c/source/i18n/plurrule.cpp
View File

@ -1376,7 +1376,7 @@ FixedDecimal::FixedDecimal(const FixedDecimal &other) {
void FixedDecimal::init(double n) {
int64_t numFractionDigits = decimals(n);
int32_t numFractionDigits = decimals(n);
init(n, numFractionDigits, getFractionalDigits(n, numFractionDigits));
}