diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-08 13:39:53 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-08 13:39:53 -0800 |
| commit | 7a73effb9fe071fbc852b30865d7a332e96fbd56 (patch) | |
| tree | e3a61318b805e6b7108e6889235a2e44e382b3d6 /core | |
| parent | 1d95d654dde9380265be8d412141e03f7ba12da3 (diff) | |
| download | pdfium-7a73effb9fe071fbc852b30865d7a332e96fbd56.tar.xz | |
Tidy fpdfsave.cpp
Remove CFX_PtrArray filelist.
Promote ScopedFileStream to .h file and use it.
Fix _CAPS names, bool returns, and put in anonymous namespace.
FX_CreateMemoryStream() can't return null, so remove checks.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1672153002 .
Diffstat (limited to 'core')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 8 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 5 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp | 5 |
3 files changed, 6 insertions, 12 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 6620a71e2e..18a942e4e8 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -12,7 +12,7 @@ #include <set> #include "core/include/fpdfapi/fpdf_objects.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_basic.h" class CFX_Font; class CFX_Matrix; @@ -28,7 +28,6 @@ class CPDF_Object; class CPDF_Parser; class CPDF_Pattern; class CPDF_StandardSecurityHandler; -class IFX_FileRead; class IPDF_SecurityHandler; #define FPDFPERM_PRINT 0x0004 @@ -41,6 +40,11 @@ class IPDF_SecurityHandler; #define FPDFPERM_PRINT_HIGH 0x0800 #define FPDF_PAGE_MAX_NUM 0xFFFFF +// TODO(thestig) Using unique_ptr with ReleaseDeleter is still not ideal. +// Come up or wait for something better. +using ScopedFileStream = + std::unique_ptr<IFX_FileStream, ReleaseDeleter<IFX_FileStream>>; + // Use the accessors below instead of directly accessing PDF_CharType. extern const char PDF_CharType[256]; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 6489b1ed98..f170b20d98 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -81,11 +81,6 @@ bool CanReadFromBitStream(const CFX_BitStream* hStream, } // namespace -// TODO(thestig) Using unique_ptr with ReleaseDeleter is still not ideal. -// Come up or wait for something better. -using ScopedFileStream = - std::unique_ptr<IFX_FileStream, ReleaseDeleter<IFX_FileStream>>; - bool IsSignatureDict(const CPDF_Dictionary* pDict) { CPDF_Object* pType = pDict->GetElementValue("Type"); if (!pType) diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp index 77780b9dcf..e71b19011e 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp @@ -68,11 +68,6 @@ class CPDF_TestParser : public CPDF_Parser { FRIEND_TEST(fpdf_parser_parser, LoadCrossRefV4); }; -// TODO(thestig) Using unique_ptr with ReleaseDeleter is still not ideal. -// Come up or wait for something better. -using ScopedFileStream = - std::unique_ptr<IFX_FileStream, ReleaseDeleter<IFX_FileStream>>; - TEST(fpdf_parser_parser, ReadHexString) { { // Empty string. |