diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 17:38:11 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 17:38:11 -0700 |
| commit | ca3ac5e9ffc936066267fbb1c329e5297d8e23e6 (patch) | |
| tree | 986e666023ae0eec649051613d83c6c60ef3dac0 /core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp | |
| parent | 0aa0e7331b3512066df3e33d6642456a0de63de7 (diff) | |
| download | pdfium-ca3ac5e9ffc936066267fbb1c329e5297d8e23e6.tar.xz | |
Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
Nearly automatic merge + re-run script on new files.
Original Review URL: https://codereview.chromium.org/1180593004.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1174303002.
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp index 973a14e33b..b4366ba277 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp @@ -103,7 +103,7 @@ FX_DWORD CPDF_StandardSecurityHandler::GetPermissions() { return m_Permissions; } -static FX_BOOL _LoadCryptInfo(CPDF_Dictionary* pEncryptDict, FX_BSTR name, int& cipher, int& keylen) +static FX_BOOL _LoadCryptInfo(CPDF_Dictionary* pEncryptDict, const CFX_ByteStringC& name, int& cipher, int& keylen) { int Version = pEncryptDict->GetInteger(FX_BSTRC("V")); cipher = FXCIPHER_RC4; |