2 diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp
3 index 31564f45f..5858549ef 100644
4 --- a/core/fpdfdoc/cpdf_metadata.cpp
5 +++ b/core/fpdfdoc/cpdf_metadata.cpp
6 @@ -87,7 +87,7 @@ std::vector<UnsupportedFeature> CPDF_Metadata::CheckForSharedForm() const {
7 CFX_XMLParser parser(stream);
8 std::unique_ptr<CFX_XMLDocument> doc = parser.Parse();
11 + return std::vector<UnsupportedFeature>();
13 std::vector<UnsupportedFeature> unsupported;
14 CheckForSharedFormInternal(/*depth=*/0, doc->GetRoot(), &unsupported);
15 diff --git a/third_party/libopenjpeg/openjpeg.c b/third_party/libopenjpeg/openjpeg.c
16 index 9dd4256d7..949d65830 100644
17 --- a/third_party/libopenjpeg/openjpeg.c
18 +++ b/third_party/libopenjpeg/openjpeg.c
19 @@ -358,7 +358,7 @@ OPJ_BOOL OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec,
23 -OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decoder_set_strict_mode(opj_codec_t *p_codec,
24 +OPJ_BOOL OPJ_CALLCONV opj_decoder_set_strict_mode(opj_codec_t *p_codec,
28 diff --git a/core/fxge/cfx_face.cpp b/core/fxge/cfx_face.cpp
29 index 7d9cd0f44..0d0a311aa 100644
30 --- a/core/fxge/cfx_face.cpp
31 +++ b/core/fxge/cfx_face.cpp
32 @@ -654,7 +654,7 @@ int CFX_Face::GetCharIndex(uint32_t code) {
35 int CFX_Face::GetNameIndex(const char* name) {
36 - return FT_Get_Name_Index(GetRec(), name);
37 + return FT_Get_Name_Index(GetRec(), const_cast<char*>(name));
40 FX_RECT CFX_Face::GetCharBBox(uint32_t code, int glyph_index) {