diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-09-10 16:40:49 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-09-10 16:40:49 -0700 |
| commit | 536486822a5550de975293f7586598be5f29aaad (patch) | |
| tree | c854dc8c38baae7acfb820f70913b3653b131f51 /core/src/fxcodec/jbig2/JBig2_Context.h | |
| parent | bffb53e526205df6c6313677270044cfcdd1abde (diff) | |
| download | pdfium-536486822a5550de975293f7586598be5f29aaad.tar.xz | |
Merge to XFA: Remove CJBig2_Object, CJBig2_Module, and friends.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1326953006 .
(cherry picked from commit 70f4404e9a9e69afdfdd07715aa946f6561ce0cb)
Review URL: https://codereview.chromium.org/1336783002 .
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_Context.h')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Context.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h index 0590fd157b..5ae6897bab 100644 --- a/core/src/fxcodec/jbig2/JBig2_Context.h +++ b/core/src/fxcodec/jbig2/JBig2_Context.h @@ -14,11 +14,10 @@ #include "../../../include/fxcodec/fx_codec_def.h" #include "JBig2_GeneralDecoder.h" #include "JBig2_List.h" -#include "JBig2_Module.h" #include "JBig2_Page.h" #include "JBig2_Segment.h" -using CJBig2_CachePair = std::pair<uint8_t*, CJBig2_SymbolDict*>; +using CJBig2_CachePair = std::pair<const uint8_t*, CJBig2_SymbolDict*>; #define JBIG2_SUCCESS 0 #define JBIG2_FAILED -1 @@ -35,13 +34,12 @@ using CJBig2_CachePair = std::pair<uint8_t*, CJBig2_SymbolDict*>; #define JBIG2_EMBED_STREAM 3 #define JBIG2_MIN_SEGMENT_SIZE 11 -class CJBig2_Context : public CJBig2_Object { +class CJBig2_Context { public: static CJBig2_Context* CreateContext( - CJBig2_Module* pModule, - uint8_t* pGlobalData, + const uint8_t* pGlobalData, FX_DWORD dwGlobalLength, - uint8_t* pData, + const uint8_t* pData, FX_DWORD dwLength, int32_t nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, @@ -66,9 +64,9 @@ class CJBig2_Context : public CJBig2_Object { JBIG2_IN_PAGE, }; - CJBig2_Context(uint8_t* pGlobalData, + CJBig2_Context(const uint8_t* pGlobalData, FX_DWORD dwGlobalLength, - uint8_t* pData, + const uint8_t* pData, FX_DWORD dwLength, int32_t nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, |