Index: core/src/fxcodec/jbig2/JBig2_Context.h |
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h |
index 1af6b9444c98ec30259a7a1965118b01cc8eac5e..901574b0b8cdc6a201a1c05a4b50f221f8afd2b4 100644 |
--- a/core/src/fxcodec/jbig2/JBig2_Context.h |
+++ b/core/src/fxcodec/jbig2/JBig2_Context.h |
@@ -28,10 +28,6 @@ using CJBig2_CachePair = std::pair<const uint8_t*, CJBig2_SymbolDict*>; |
#define JBIG2_ERROR_FILE_FORMAT -4 |
#define JBIG2_ERROR_STREAM_TYPE -5 |
#define JBIG2_ERROR_LIMIT -6 |
-#define JBIG2_FILE_STREAM 0 |
Tom Sepez
2015/09/24 16:44:38
In a type-safe world, this is correct because:
de
|
-#define JBIG2_SQUENTIAL_STREAM 1 |
-#define JBIG2_RANDOM_STREAM 2 |
-#define JBIG2_EMBED_STREAM 3 |
#define JBIG2_MIN_SEGMENT_SIZE 11 |
class CJBig2_Context { |
@@ -41,7 +37,6 @@ class CJBig2_Context { |
FX_DWORD dwGlobalLength, |
const uint8_t* pData, |
FX_DWORD dwLength, |
- int32_t nStreamType, |
std::list<CJBig2_CachePair>* pSymbolDictCache, |
IFX_Pause* pPause = NULL); |
@@ -53,8 +48,6 @@ class CJBig2_Context { |
int32_t stride, |
IFX_Pause* pPause); |
- int32_t getFirstPage(CJBig2_Image** image, IFX_Pause* pPause); |
- |
int32_t Continue(IFX_Pause* pPause); |
FXCODEC_STATUS GetProcessingStatus() { return m_ProcessingStatus; } |
@@ -68,14 +61,11 @@ class CJBig2_Context { |
FX_DWORD dwGlobalLength, |
const uint8_t* pData, |
FX_DWORD dwLength, |
- int32_t nStreamType, |
std::list<CJBig2_CachePair>* pSymbolDictCache, |
IFX_Pause* pPause); |
~CJBig2_Context(); |
- int32_t decodeFile(IFX_Pause* pPause); |
- |
int32_t decode_SquentialOrgnazation(IFX_Pause* pPause); |
int32_t decode_EmbedOrgnazation(IFX_Pause* pPause); |
@@ -121,7 +111,6 @@ class CJBig2_Context { |
private: |
CJBig2_Context* m_pGlobalContext; |
- int32_t m_nStreamType; |
CJBig2_BitStream* m_pStream; |
int32_t m_nState; |
CJBig2_List<CJBig2_Segment> m_SegmentList; |