external/pdfium/build.patch.1

   1 -*- Mode: diff -*-
   2 diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp
   3 index 323de4ffc..f11a0b0ad 100644
   4 --- a/core/fpdfdoc/cpdf_metadata.cpp
   5 +++ b/core/fpdfdoc/cpdf_metadata.cpp
   6 @@ -74,7 +74,7 @@ std::vector<UnsupportedFeature> CPDF_Metadata::CheckForSharedForm() const {
   7    CFX_XMLParser parser(stream);
   8    std::unique_ptr<CFX_XMLDocument> doc = parser.Parse();
   9    if (!doc)
  10 -    return {};
  11 +    return std::vector<UnsupportedFeature>();
  12
  13    std::vector<UnsupportedFeature> unsupported;
  14    CheckForSharedFormInternal(doc->GetRoot(), &unsupported);
  15 diff --git a/third_party/base/span.h b/third_party/base/span.h
  16 index 0fb627ba8..f71c362e2 100644
  17 --- a/third_party/base/span.h
  18 +++ b/third_party/base/span.h
  19 @@ -214,7 +214,7 @@ class span {
  20    // Conversions from spans of compatible types: this allows a span<T> to be
  21    // seamlessly used as a span<const T>, but not the other way around.
  22    template <typename U, typename = internal::EnableIfLegalSpanConversion<U, T>>
  23 -  constexpr span(const span<U>& other) : span(other.data(), other.size()) {}
  24 +  span(const span<U>& other) : span(other.data(), other.size()) {}
  25    span& operator=(const span& other) noexcept = default;
  26    ~span() noexcept {
  27      if (!size_) {
  28 diff --git a/third_party/base/span.h b/third_party/base/span.h
  29 index 0fb627ba8..dda1fc8bc 100644
  30 --- a/third_party/base/span.h
  31 +++ b/third_party/base/span.h
  32 @@ -204,7 +204,7 @@ class span {
  33    // size()|.
  34    template <typename Container,
  35              typename = internal::EnableIfSpanCompatibleContainer<Container, T>>
  36 -  constexpr span(Container& container)
  37 +  span(Container& container)
  38        : span(container.data(), container.size()) {}
  39    template <
  40        typename Container,
  41 diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp
  42 index d8875786c..bc019ebe1 100644
  43 --- a/core/fxcodec/jpx/cjpx_decoder.cpp
  44 +++ b/core/fxcodec/jpx/cjpx_decoder.cpp
  45 @@ -73,7 +73,7 @@ absl::optional<OpjImageRgbData> alloc_rgb(size_t size) {
  46    if (!data.b)
  47      return absl::nullopt;
  48
  49 -  return data;
  50 +  return std::move(data);
  51  }
  52
  53  void sycc_to_rgb(int offset,
  54 --- a/core/fxcodec/fx_codec.h
  55 +++ b/core/fxcodec/fx_codec.h
  56 @@ -8,6 +8,7 @@
  57  #define CORE_FXCODEC_FX_CODEC_H_
  58
  59  #include <map>
  60 +#include <cstdint>
  61
  62  #include "third_party/abseil-cpp/absl/types/optional.h"
  63