diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 15:49:49 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 20:17:31 +0000 |
| commit | 0b95042db2e6dab5876abd12ce485fff0a8e08fe (patch) | |
| tree | 02132ed53945fde30bfbf230ff4e9b5308dd7732 /core/fxcodec/jbig2 | |
| parent | a5eb9f05b7c3f82630784e043ccf75c4e019b18f (diff) | |
| download | pdfium-0b95042db2e6dab5876abd12ce485fff0a8e08fe.tar.xz | |
Rename CFX_RetainPtr to RetainPtr
This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt
namespace.
Bug: pdfium:898
Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e
Reviewed-on: https://pdfium-review.googlesource.com/14616
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_BitStream.cpp | 3 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_BitStream.h | 4 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_Context.cpp | 9 | ||||
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_Context.h | 4 |
4 files changed, 9 insertions, 11 deletions
diff --git a/core/fxcodec/jbig2/JBig2_BitStream.cpp b/core/fxcodec/jbig2/JBig2_BitStream.cpp index 921fa2a661..a72099d4ff 100644 --- a/core/fxcodec/jbig2/JBig2_BitStream.cpp +++ b/core/fxcodec/jbig2/JBig2_BitStream.cpp @@ -11,8 +11,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" -CJBig2_BitStream::CJBig2_BitStream( - const CFX_RetainPtr<CPDF_StreamAcc>& pSrcStream) +CJBig2_BitStream::CJBig2_BitStream(const RetainPtr<CPDF_StreamAcc>& pSrcStream) : m_pBuf(pSrcStream->GetData()), m_dwLength(pSrcStream->GetSize()), m_dwByteIdx(0), diff --git a/core/fxcodec/jbig2/JBig2_BitStream.h b/core/fxcodec/jbig2/JBig2_BitStream.h index 0be6c4b977..0edb432dde 100644 --- a/core/fxcodec/jbig2/JBig2_BitStream.h +++ b/core/fxcodec/jbig2/JBig2_BitStream.h @@ -7,13 +7,13 @@ #ifndef CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ #define CORE_FXCODEC_JBIG2_JBIG2_BITSTREAM_H_ -#include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/retain_ptr.h" class CPDF_StreamAcc; class CJBig2_BitStream { public: - explicit CJBig2_BitStream(const CFX_RetainPtr<CPDF_StreamAcc>& pSrcStream); + explicit CJBig2_BitStream(const RetainPtr<CPDF_StreamAcc>& pSrcStream); ~CJBig2_BitStream(); // TODO(thestig): readFoo() should return bool. diff --git a/core/fxcodec/jbig2/JBig2_Context.cpp b/core/fxcodec/jbig2/JBig2_Context.cpp index 363be2fc31..7c79ad8802 100644 --- a/core/fxcodec/jbig2/JBig2_Context.cpp +++ b/core/fxcodec/jbig2/JBig2_Context.cpp @@ -48,11 +48,10 @@ size_t GetRefAggContextSize(bool val) { // difference for typical JBIG2 documents. static const int kSymbolDictCacheMaxSize = 2; -CJBig2_Context::CJBig2_Context( - const CFX_RetainPtr<CPDF_StreamAcc>& pGlobalStream, - const CFX_RetainPtr<CPDF_StreamAcc>& pSrcStream, - std::list<CJBig2_CachePair>* pSymbolDictCache, - bool bIsGlobal) +CJBig2_Context::CJBig2_Context(const RetainPtr<CPDF_StreamAcc>& pGlobalStream, + const RetainPtr<CPDF_StreamAcc>& pSrcStream, + std::list<CJBig2_CachePair>* pSymbolDictCache, + bool bIsGlobal) : m_nSegmentDecoded(0), m_bInPage(false), m_bBufSpecified(false), diff --git a/core/fxcodec/jbig2/JBig2_Context.h b/core/fxcodec/jbig2/JBig2_Context.h index c88fc6f187..bed1079db9 100644 --- a/core/fxcodec/jbig2/JBig2_Context.h +++ b/core/fxcodec/jbig2/JBig2_Context.h @@ -40,8 +40,8 @@ using CJBig2_CachePair = class CJBig2_Context { public: - CJBig2_Context(const CFX_RetainPtr<CPDF_StreamAcc>& pGlobalStream, - const CFX_RetainPtr<CPDF_StreamAcc>& pSrcStream, + CJBig2_Context(const RetainPtr<CPDF_StreamAcc>& pGlobalStream, + const RetainPtr<CPDF_StreamAcc>& pSrcStream, std::list<CJBig2_CachePair>* pSymbolDictCache, bool bIsGlobal); ~CJBig2_Context(); |