diff options
| author | Andras Timar <andras.timar@collabora.com> | 2022-03-15 15:44:06 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-03-15 15:44:06 +0100 |
| commit | b7e3fa54b384832c2b7587dbf08abdfd69b7e2f9 (patch) | |
| tree | 15fac14bc0d14bfc1dafd6e2a57483f773cead26 | |
| parent | 0658247f4735c638b970812a4da455f19506131c (diff) | |
Bump version to 7.2.6.2.M1
Change-Id: Ic23fa6ca2532f643fe9f5ccb247904fc7d8af68e
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 93ac137b1017..408e6978cf09 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.2.7.0.M0],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.2.6.2.M1],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index cf9a40e74321..5e3ae96527ee 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -97,6 +97,23 @@ // making those images unreadable for older readers. So for now // disable the support so that .webp images will be written out as .png, // and somewhen later enable the support unconditionally. + +namespace +{ +template <typename charT, typename traits = std::char_traits<charT>> +constexpr bool starts_with(std::basic_string_view<charT, traits> sv, + std::basic_string_view<charT, traits> x) noexcept +{ + return sv.substr(0, x.size()) == x; +} +template <typename charT, typename traits = std::char_traits<charT>> +constexpr bool starts_with(std::basic_string_view<charT, traits> sv, charT const* x) +{ + return starts_with(sv, std::basic_string_view<charT, traits>(x)); +} + +} + static bool supportNativeWebp() { const char* const testname = getenv("LO_TESTNAME"); @@ -105,7 +122,7 @@ static bool supportNativeWebp() // Enable support only for those unittests that test it. if( std::string_view("_anonymous_namespace___GraphicTest__testUnloadedGraphicLoading_") == testname || std::string_view("VclFiltersTest__testExportImport_") == testname - || o3tl::starts_with(std::string_view(testname), "WebpFilterTest__")) + || starts_with(std::string_view(testname), "WebpFilterTest__")) return true; return false; } |