diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp index 8e01127b0..f4ce4d915 100644 --- a/core/fxge/dib/cfx_imagetransformer.cpp +++ b/core/fxge/dib/cfx_imagetransformer.cpp @@ -315,14 +315,14 @@ bool CFX_ImageTransformer::Continue(IFX_PauseIndicator* pPause) { } else if (pDestMask) { CalcData cdata = { pDestMask.Get(), result2stretch, pSrcMaskBuf, - m_Storer.GetBitmap()->m_pAlphaMask->GetPitch(), + static_cast(m_Storer.GetBitmap()->m_pAlphaMask->GetPitch()), }; CalcMask(cdata); } CalcData cdata = {pTransformed.Get(), result2stretch, m_Storer.GetBitmap()->GetBuffer(), - m_Storer.GetBitmap()->GetPitch()}; + static_cast(m_Storer.GetBitmap()->GetPitch())}; if (m_Storer.GetBitmap()->IsAlphaMask()) { CalcAlpha(cdata); } else { diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp index 323de4ffc..f11a0b0ad 100644 --- a/core/fpdfdoc/cpdf_metadata.cpp +++ b/core/fpdfdoc/cpdf_metadata.cpp @@ -74,7 +74,7 @@ std::vector CPDF_Metadata::CheckForSharedForm() const { CFX_XMLParser parser(stream); std::unique_ptr doc = parser.Parse(); if (!doc) - return {}; + return std::vector(); std::vector unsupported; CheckForSharedFormInternal(doc->GetRoot(), &unsupported); diff --git a/third_party/base/span.h b/third_party/base/span.h index 0fb627ba8..f71c362e2 100644 --- a/third_party/base/span.h +++ b/third_party/base/span.h @@ -214,7 +214,7 @@ class span { // Conversions from spans of compatible types: this allows a span to be // seamlessly used as a span, but not the other way around. template > - constexpr span(const span& other) : span(other.data(), other.size()) {} + span(const span& other) : span(other.data(), other.size()) {} span& operator=(const span& other) noexcept = default; ~span() noexcept { if (!size_) { diff --git a/third_party/base/span.h b/third_party/base/span.h index 0fb627ba8..dda1fc8bc 100644 --- a/third_party/base/span.h +++ b/third_party/base/span.h @@ -204,7 +204,7 @@ class span { // size()|. template > - constexpr span(Container& container) + span(Container& container) : span(container.data(), container.size()) {} template < typename Container, diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h index 7f4eb86c0..5e227f86e 100644 --- a/core/fpdfdoc/cpdf_dest.h +++ b/core/fpdfdoc/cpdf_dest.h @@ -41,7 +41,7 @@ float* pZoom) const; private: - UnownedPtr const m_pArray; + UnownedPtr m_pArray; }; #endif // CORE_FPDFDOC_CPDF_DEST_H_