diff options
| -rw-r--r-- | fpdfsdk/fpdfannot.cpp | 7 | ||||
| -rw-r--r-- | fpdfsdk/fpdfannot_embeddertest.cpp | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp index c7433d03d8..e40e21981e 100644 --- a/fpdfsdk/fpdfannot.cpp +++ b/fpdfsdk/fpdfannot.cpp @@ -767,11 +767,8 @@ FPDFAnnot_GetAP(FPDF_ANNOTATION annot, static_cast<CPDF_Annot::AppearanceMode>(appearanceMode); CPDF_Stream* pStream = FPDFDOC_GetAnnotAPNoFallback(pAnnotDict, mode); - if (!pStream) - return Utf16EncodeMaybeCopyAndReturnLength(L"", buffer, buflen); - - return Utf16EncodeMaybeCopyAndReturnLength(pStream->GetUnicodeText(), buffer, - buflen); + return Utf16EncodeMaybeCopyAndReturnLength( + pStream ? pStream->GetUnicodeText() : L"", buffer, buflen); } FPDF_EXPORT FPDF_ANNOTATION FPDF_CALLCONV diff --git a/fpdfsdk/fpdfannot_embeddertest.cpp b/fpdfsdk/fpdfannot_embeddertest.cpp index 6d4521f26e..f07070a4a5 100644 --- a/fpdfsdk/fpdfannot_embeddertest.cpp +++ b/fpdfsdk/fpdfannot_embeddertest.cpp @@ -19,12 +19,12 @@ static constexpr char kContentsKey[] = "Contents"; class FPDFAnnotEmbeddertest : public EmbedderTest {}; -const std::wstring BufferToWString(std::vector<char>& buf) { - return GetPlatformWString(reinterpret_cast<unsigned short*>(buf.data())); +std::wstring BufferToWString(const std::vector<char>& buf) { + return GetPlatformWString(reinterpret_cast<FPDF_WIDESTRING>(buf.data())); } -const std::string BufferToString(std::vector<char>& buf) { - return GetPlatformString(reinterpret_cast<unsigned short*>(buf.data())); +std::string BufferToString(const std::vector<char>& buf) { + return GetPlatformString(reinterpret_cast<FPDF_WIDESTRING>(buf.data())); } TEST_F(FPDFAnnotEmbeddertest, RenderAnnotWithOnlyRolloverAP) { |