1057
|
1 |
# HG changeset patch
|
|
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
|
3 |
# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc
|
|
4 |
|
|
5 |
diff --git a/intl/icu/source/i18n/number_grouping.cpp b/intl/icu/source/i18n/number_grouping.cpp
|
|
6 |
--- a/intl/icu/source/i18n/number_grouping.cpp
|
|
7 |
+++ b/intl/icu/source/i18n/number_grouping.cpp
|
|
8 |
@@ -43,16 +43,17 @@ Grouper Grouper::forStrategy(UGroupingSt
|
|
9 |
case UNUM_GROUPING_MIN2:
|
|
10 |
return {-2, -2, -3};
|
|
11 |
case UNUM_GROUPING_ON_ALIGNED:
|
|
12 |
return {-4, -4, 1};
|
|
13 |
case UNUM_GROUPING_THOUSANDS:
|
|
14 |
return {3, 3, 1};
|
|
15 |
default:
|
|
16 |
U_ASSERT(FALSE);
|
|
17 |
+ return {0, 0, 0};
|
|
18 |
}
|
|
19 |
}
|
|
20 |
|
|
21 |
void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Locale& locale) {
|
|
22 |
if (fGrouping1 != -2 && fGrouping2 != -4) {
|
|
23 |
return;
|
|
24 |
}
|
|
25 |
auto grouping1 = static_cast<int16_t> (patternInfo.positive.groupingSizes & 0xffff);
|
|
26 |
diff --git a/media/libcubeb/src/cubeb_utils.cpp b/media/libcubeb/src/cubeb_utils.cpp
|
|
27 |
--- a/media/libcubeb/src/cubeb_utils.cpp
|
|
28 |
+++ b/media/libcubeb/src/cubeb_utils.cpp
|
|
29 |
@@ -14,10 +14,11 @@ size_t cubeb_sample_size(cubeb_sample_fo
|
|
30 |
case CUBEB_SAMPLE_S16BE:
|
|
31 |
return sizeof(int16_t);
|
|
32 |
case CUBEB_SAMPLE_FLOAT32LE:
|
|
33 |
case CUBEB_SAMPLE_FLOAT32BE:
|
|
34 |
return sizeof(float);
|
|
35 |
default:
|
|
36 |
// should never happen as all cases are handled above.
|
|
37 |
assert(false);
|
|
38 |
+ return sizeof(float);
|
|
39 |
}
|
|
40 |
}
|