diff options
author | Lei Zhang <thestig@chromium.org> | 2018-07-18 04:52:18 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-07-18 04:52:18 +0000 |
commit | beb56d69a7a57317d521bab927a651fb260f5404 (patch) | |
tree | b2f0ba0b35af67635ff3e72a57b802ca5b5cfa2b /core/fpdfdoc/cpdf_filespec.cpp | |
parent | 084c31d93439d5166c60dbfb0ccee6db1406d09c (diff) | |
download | pdfium-beb56d69a7a57317d521bab927a651fb260f5404.tar.xz |
Avoid writing const/non-const versions of the same function.
Use const_cast for the non-const version to call the const version.
Change-Id: Ibdf5fe53255ee6e983555080336f5d63e683afd1
Reviewed-on: https://pdfium-review.googlesource.com/37490
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfdoc/cpdf_filespec.cpp')
-rw-r--r-- | core/fpdfdoc/cpdf_filespec.cpp | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp index 95254b7bb8..2cc51e33d3 100644 --- a/core/fpdfdoc/cpdf_filespec.cpp +++ b/core/fpdfdoc/cpdf_filespec.cpp @@ -19,10 +19,6 @@ namespace { -// List of keys to check for the file specification string. -// Follows the same precedence order as GetFileName(). -constexpr const char* kKeys[] = {"UF", "F", "DOS", "Mac", "Unix"}; - #if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ || \ _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ WideString ChangeSlashToPlatform(const wchar_t* str) { @@ -136,6 +132,9 @@ const CPDF_Stream* CPDF_FileSpec::GetFileStream() const { if (!pFiles) return nullptr; + // List of keys to check for the file specification string. + // Follows the same precedence order as GetFileName(). + constexpr const char* kKeys[] = {"UF", "F", "DOS", "Mac", "Unix"}; size_t end = pDict->GetStringFor("FS") == "URL" ? 2 : FX_ArraySize(kKeys); for (size_t i = 0; i < end; ++i) { ByteString key = kKeys[i]; @@ -149,25 +148,8 @@ const CPDF_Stream* CPDF_FileSpec::GetFileStream() const { } CPDF_Stream* CPDF_FileSpec::GetFileStream() { - CPDF_Dictionary* pDict = m_pWritableObj->AsDictionary(); - if (!pDict) - return nullptr; - - // Get the embedded files dictionary. - CPDF_Dictionary* pFiles = pDict->GetDictFor("EF"); - if (!pFiles) - return nullptr; - - size_t end = pDict->GetStringFor("FS") == "URL" ? 2 : FX_ArraySize(kKeys); - for (size_t i = 0; i < end; ++i) { - ByteString key = kKeys[i]; - if (!pDict->GetUnicodeTextFor(key).IsEmpty()) { - CPDF_Stream* pStream = pFiles->GetStreamFor(key); - if (pStream) - return pStream; - } - } - return nullptr; + return const_cast<CPDF_Stream*>( + static_cast<const CPDF_FileSpec*>(this)->GetFileStream()); } const CPDF_Dictionary* CPDF_FileSpec::GetParamsDict() const { @@ -180,12 +162,8 @@ const CPDF_Dictionary* CPDF_FileSpec::GetParamsDict() const { } CPDF_Dictionary* CPDF_FileSpec::GetParamsDict() { - CPDF_Stream* pStream = GetFileStream(); - if (!pStream) - return nullptr; - - CPDF_Dictionary* pDict = pStream->GetDict(); - return pDict ? pDict->GetDictFor("Params") : nullptr; + return const_cast<CPDF_Dictionary*>( + static_cast<const CPDF_FileSpec*>(this)->GetParamsDict()); } WideString CPDF_FileSpec::EncodeFileName(const WideString& filepath) { |