forked from pool/MozillaFirefox
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||
|
|
# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc
|
||
|
|
|
||
|
|
diff --git a/intl/icu/source/i18n/number_grouping.cpp b/intl/icu/source/i18n/number_grouping.cpp
|
||
|
|
--- a/intl/icu/source/i18n/number_grouping.cpp
|
||
|
|
+++ b/intl/icu/source/i18n/number_grouping.cpp
|
||
|
|
@@ -43,16 +43,17 @@ Grouper Grouper::forStrategy(UGroupingSt
|
||
|
|
case UNUM_GROUPING_MIN2:
|
||
|
|
return {-2, -2, -3};
|
||
|
|
case UNUM_GROUPING_ON_ALIGNED:
|
||
|
|
return {-4, -4, 1};
|
||
|
|
case UNUM_GROUPING_THOUSANDS:
|
||
|
|
return {3, 3, 1};
|
||
|
|
default:
|
||
|
|
U_ASSERT(FALSE);
|
||
|
|
+ return {0, 0, 0};
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Locale& locale) {
|
||
|
|
if (fGrouping1 != -2 && fGrouping2 != -4) {
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
auto grouping1 = static_cast<int16_t> (patternInfo.positive.groupingSizes & 0xffff);
|
||
|
|
diff --git a/media/libcubeb/src/cubeb_utils.cpp b/media/libcubeb/src/cubeb_utils.cpp
|
||
|
|
--- a/media/libcubeb/src/cubeb_utils.cpp
|
||
|
|
+++ b/media/libcubeb/src/cubeb_utils.cpp
|
||
|
|
@@ -14,10 +14,11 @@ size_t cubeb_sample_size(cubeb_sample_fo
|
||
|
|
case CUBEB_SAMPLE_S16BE:
|
||
|
|
return sizeof(int16_t);
|
||
|
|
case CUBEB_SAMPLE_FLOAT32LE:
|
||
|
|
case CUBEB_SAMPLE_FLOAT32BE:
|
||
|
|
return sizeof(float);
|
||
|
|
default:
|
||
|
|
// should never happen as all cases are handled above.
|
||
|
|
assert(false);
|
||
|
|
+ return sizeof(float);
|
||
|
|
}
|
||
|
|
}
|