From 70f4404e9a9e69afdfdd07715aa946f6561ce0cb Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 10 Sep 2015 16:12:44 -0700 Subject: Remove CJBig2_Object, CJBig2_Module, and friends. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1326953006 . --- core/src/fxcodec/jbig2/JBig2_Define.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'core/src/fxcodec/jbig2/JBig2_Define.h') diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/src/fxcodec/jbig2/JBig2_Define.h index 3cca6acfd9..50516f5798 100644 --- a/core/src/fxcodec/jbig2/JBig2_Define.h +++ b/core/src/fxcodec/jbig2/JBig2_Define.h @@ -6,24 +6,28 @@ #ifndef _JBIG2_DEFINE_H_ #define _JBIG2_DEFINE_H_ + #include "../../../include/fxcrt/fx_system.h" #define JBIG2_memset FXSYS_memset #define JBIG2_memcmp FXSYS_memcmp #define JBIG2_memcpy FXSYS_memcpy -#include "JBig2_Object.h" #define JBIG2_OOB 1 -typedef struct { - int32_t width, height; - int32_t x, y; + +struct JBig2RegionInfo { + int32_t width; + int32_t height; + int32_t x; + int32_t y; uint8_t flags; -} JBig2RegionInfo; -typedef struct { +}; + +struct JBig2HuffmanCode { int32_t codelen; int32_t code; -} JBig2HuffmanCode; +}; + extern "C" { -void _FaxG4Decode(void* pModule, - const uint8_t* src_buf, +void _FaxG4Decode(const uint8_t* src_buf, FX_DWORD src_size, int* pbitpos, uint8_t* dest_buf, @@ -31,9 +35,11 @@ void _FaxG4Decode(void* pModule, int height, int pitch = 0); }; + #define JBIG2_MAX_REFERRED_SEGMENT_COUNT 64 #define JBIG2_MAX_EXPORT_SYSMBOLS 65535 #define JBIG2_MAX_NEW_SYSMBOLS 65535 #define JBIG2_MAX_PATTERN_INDEX 65535 #define JBIG2_MAX_IMAGE_SIZE 65535 + #endif -- cgit v1.2.3