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