diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-01-20 14:33:49 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-01-20 14:33:49 -0800 |
| commit | fcb6398ea511e32a09d192543f70041b82646df1 (patch) | |
| tree | 5e7809400749292195e47ec24af1018d3b002343 /core/include | |
| parent | 49e4932735292790c77b5362603d9f5d7f6adaaa (diff) | |
| download | pdfium-fcb6398ea511e32a09d192543f70041b82646df1.tar.xz | |
Merge to XFA: Replace more CFX_MapPtrToPtr.
Original Review URL: https://codereview.chromium.org/1580573002 .
(cherry picked from commit a505d9d3e13485e090e50d5d83f882fb707d3f48)
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1610163003 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 2 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index bdddfc37d7..ad4f1f9a9a 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -545,7 +545,7 @@ class CPDF_Parser { FX_DWORD m_dwXrefStartObjNum; // A map of object numbers to indirect streams. Map owns the streams. - CFX_MapPtrToPtr m_ObjectStreamMap; + std::map<FX_DWORD, std::unique_ptr<CPDF_StreamAcc>> m_ObjectStreamMap; // Mapping of object numbers to offsets. The offsets are relative to the first // object in the stream. diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 3414dbc13b..3377dec459 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -640,6 +640,7 @@ class CFX_FixedBufGrow { DataType m_Data[FixedSize]; DataType* m_pData; }; +#ifdef PDF_ENABLE_XFA class CFX_MapPtrToPtr { protected: struct CAssoc { @@ -704,7 +705,7 @@ class CFX_MapPtrToPtr { CAssoc* GetAssocAt(void* key, FX_DWORD& hash) const; }; -#ifdef PDF_ENABLE_XFA + template <class KeyType, class ValueType> class CFX_MapPtrTemplate : public CFX_MapPtrToPtr { public: |