summaryrefslogtreecommitdiff
path: root/core/src/fxcodec/jbig2
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-09 13:24:12 -0700
commitbfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch)
tree4cfbe682869d89900f33751c37f6a84865beeb0a /core/src/fxcodec/jbig2
parentb116136da234afcad018bb44a3ccb64b9ad2a554 (diff)
downloadpdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz
Merge to XFA: Use stdint.h types throughout PDFium.
Near-automatic merge, plus re-running scripts to update additional usage. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1172793002
Diffstat (limited to 'core/src/fxcodec/jbig2')
-rw-r--r--core/src/fxcodec/jbig2/JBig2_BitStream.h66
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Context.cpp122
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Context.h62
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Define.h10
-rw-r--r--core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp200
-rw-r--r--core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h26
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Image.cpp338
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Image.h40
-rw-r--r--core/src/fxcodec/jbig2/JBig2_List.h12
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Module.h2
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Object.cpp12
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Page.h2
-rw-r--r--core/src/fxcodec/jbig2/JBig2_Segment.h12
13 files changed, 452 insertions, 452 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.h b/core/src/fxcodec/jbig2/JBig2_BitStream.h
index 9d5d29468f..ff0b9fcfeb 100644
--- a/core/src/fxcodec/jbig2/JBig2_BitStream.h
+++ b/core/src/fxcodec/jbig2/JBig2_BitStream.h
@@ -11,41 +11,41 @@ class CJBig2_BitStream : public CJBig2_Object
{
public:
- CJBig2_BitStream(FX_BYTE *pBuffer, FX_DWORD dwLength);
+ CJBig2_BitStream(uint8_t *pBuffer, FX_DWORD dwLength);
CJBig2_BitStream(CJBig2_BitStream &bs);
~CJBig2_BitStream();
- FX_INT32 readNBits(FX_DWORD nBits, FX_DWORD *dwResult);
+ int32_t readNBits(FX_DWORD nBits, FX_DWORD *dwResult);
- FX_INT32 readNBits(FX_DWORD nBits, FX_INT32 *nResult);
+ int32_t readNBits(FX_DWORD nBits, int32_t *nResult);
- FX_INT32 read1Bit(FX_DWORD *dwResult);
+ int32_t read1Bit(FX_DWORD *dwResult);
- FX_INT32 read1Bit(FX_BOOL *bResult);
+ int32_t read1Bit(FX_BOOL *bResult);
- FX_INT32 read1Byte(FX_BYTE *cResult);
+ int32_t read1Byte(uint8_t *cResult);
- FX_INT32 readInteger(FX_DWORD *dwResult);
+ int32_t readInteger(FX_DWORD *dwResult);
- FX_INT32 readShortInteger(FX_WORD *wResult);
+ int32_t readShortInteger(FX_WORD *wResult);
void alignByte();
void align4Byte();
- FX_BYTE getAt(FX_DWORD dwOffset);
+ uint8_t getAt(FX_DWORD dwOffset);
- FX_BYTE getCurByte();
+ uint8_t getCurByte();
- FX_BYTE getNextByte();
+ uint8_t getNextByte();
- FX_INT32 incByteIdx();
+ int32_t incByteIdx();
- FX_BYTE getCurByte_arith();
+ uint8_t getCurByte_arith();
- FX_BYTE getNextByte_arith();
+ uint8_t getNextByte_arith();
FX_DWORD getOffset();
@@ -55,21 +55,21 @@ public:
void setBitPos(FX_DWORD dwBitPos);
- FX_BYTE *getBuf();
+ uint8_t *getBuf();
FX_DWORD getLength()
{
return m_dwLength;
}
- FX_BYTE *getPointer();
+ uint8_t *getPointer();
void offset(FX_DWORD dwOffset);
FX_DWORD getByteLeft();
private:
- FX_BYTE *m_pBuf;
+ uint8_t *m_pBuf;
FX_DWORD m_dwLength;
@@ -77,7 +77,7 @@ private:
FX_DWORD m_dwBitIdx;
};
-inline CJBig2_BitStream::CJBig2_BitStream(FX_BYTE *pBuffer, FX_DWORD dwLength)
+inline CJBig2_BitStream::CJBig2_BitStream(uint8_t *pBuffer, FX_DWORD dwLength)
{
m_pBuf = pBuffer;
m_dwLength = dwLength;
@@ -98,7 +98,7 @@ inline CJBig2_BitStream::CJBig2_BitStream(CJBig2_BitStream &bs)
inline CJBig2_BitStream::~CJBig2_BitStream()
{
}
-inline FX_INT32 CJBig2_BitStream::readNBits(FX_DWORD dwBits, FX_DWORD *dwResult)
+inline int32_t CJBig2_BitStream::readNBits(FX_DWORD dwBits, FX_DWORD *dwResult)
{
FX_DWORD dwTemp = (m_dwByteIdx << 3) + m_dwBitIdx;
if(dwTemp <= (m_dwLength << 3)) {
@@ -123,7 +123,7 @@ inline FX_INT32 CJBig2_BitStream::readNBits(FX_DWORD dwBits, FX_DWORD *dwResult)
return -1;
}
}
-inline FX_INT32 CJBig2_BitStream::readNBits(FX_DWORD dwBits, FX_INT32 *nResult)
+inline int32_t CJBig2_BitStream::readNBits(FX_DWORD dwBits, int32_t *nResult)
{
FX_DWORD dwTemp = (m_dwByteIdx << 3) + m_dwBitIdx;
if(dwTemp <= (m_dwLength << 3)) {
@@ -149,7 +149,7 @@ inline FX_INT32 CJBig2_BitStream::readNBits(FX_DWORD dwBits, FX_INT32 *nResult)
}
}
-inline FX_INT32 CJBig2_BitStream::read1Bit(FX_DWORD *dwResult)
+inline int32_t CJBig2_BitStream::read1Bit(FX_DWORD *dwResult)
{
if(m_dwByteIdx < m_dwLength) {
*dwResult = (m_pBuf[m_dwByteIdx] >> (7 - m_dwBitIdx)) & 0x01;
@@ -165,7 +165,7 @@ inline FX_INT32 CJBig2_BitStream::read1Bit(FX_DWORD *dwResult)
}
}
-inline FX_INT32 CJBig2_BitStream::read1Bit(FX_BOOL *bResult)
+inline int32_t CJBig2_BitStream::read1Bit(FX_BOOL *bResult)
{
if(m_dwByteIdx < m_dwLength) {
*bResult = (m_pBuf[m_dwByteIdx] >> (7 - m_dwBitIdx)) & 0x01;
@@ -180,7 +180,7 @@ inline FX_INT32 CJBig2_BitStream::read1Bit(FX_BOOL *bResult)
return -1;
}
}
-inline FX_INT32 CJBig2_BitStream::read1Byte(FX_BYTE *cResult)
+inline int32_t CJBig2_BitStream::read1Byte(uint8_t *cResult)
{
if(m_dwByteIdx < m_dwLength) {
*cResult = m_pBuf[m_dwByteIdx];
@@ -191,7 +191,7 @@ inline FX_INT32 CJBig2_BitStream::read1Byte(FX_BYTE *cResult)
}
}
-inline FX_INT32 CJBig2_BitStream::readInteger(FX_DWORD *dwResult)
+inline int32_t CJBig2_BitStream::readInteger(FX_DWORD *dwResult)
{
if(m_dwByteIdx + 3 < m_dwLength) {
*dwResult = (m_pBuf[m_dwByteIdx] << 24) | (m_pBuf[m_dwByteIdx + 1] << 16)
@@ -203,7 +203,7 @@ inline FX_INT32 CJBig2_BitStream::readInteger(FX_DWORD *dwResult)
}
}
-inline FX_INT32 CJBig2_BitStream::readShortInteger(FX_WORD *dwResult)
+inline int32_t CJBig2_BitStream::readShortInteger(FX_WORD *dwResult)
{
if(m_dwByteIdx + 1 < m_dwLength) {
*dwResult = (m_pBuf[m_dwByteIdx] << 8) | m_pBuf[m_dwByteIdx + 1];
@@ -228,7 +228,7 @@ inline void CJBig2_BitStream::align4Byte()
}
m_dwByteIdx = (m_dwByteIdx + 3) & -4;
}
-inline FX_BYTE CJBig2_BitStream::getAt(FX_DWORD dwOffset)
+inline uint8_t CJBig2_BitStream::getAt(FX_DWORD dwOffset)
{
if(dwOffset < m_dwLength) {
return m_pBuf[dwOffset];
@@ -236,7 +236,7 @@ inline FX_BYTE CJBig2_BitStream::getAt(FX_DWORD dwOffset)
return 0;
}
}
-inline FX_BYTE CJBig2_BitStream::getCurByte()
+inline uint8_t CJBig2_BitStream::getCurByte()
{
if(m_dwByteIdx < m_dwLength) {
return m_pBuf[m_dwByteIdx];
@@ -244,7 +244,7 @@ inline FX_BYTE CJBig2_BitStream::getCurByte()
return 0;
}
}
-inline FX_BYTE CJBig2_BitStream::getNextByte()
+inline uint8_t CJBig2_BitStream::getNextByte()
{
if(m_dwByteIdx + 1 < m_dwLength) {
return m_pBuf[m_dwByteIdx + 1];
@@ -252,7 +252,7 @@ inline FX_BYTE CJBig2_BitStream::getNextByte()
return 0;
}
}
-inline FX_INT32 CJBig2_BitStream::incByteIdx()
+inline int32_t CJBig2_BitStream::incByteIdx()
{
if(m_dwByteIdx < m_dwLength) {
m_dwByteIdx ++;
@@ -261,7 +261,7 @@ inline FX_INT32 CJBig2_BitStream::incByteIdx()
return -1;
}
}
-inline FX_BYTE CJBig2_BitStream::getCurByte_arith()
+inline uint8_t CJBig2_BitStream::getCurByte_arith()
{
if(m_dwByteIdx < m_dwLength) {
return m_pBuf[m_dwByteIdx];
@@ -269,7 +269,7 @@ inline FX_BYTE CJBig2_BitStream::getCurByte_arith()
return 0xff;
}
}
-inline FX_BYTE CJBig2_BitStream::getNextByte_arith()
+inline uint8_t CJBig2_BitStream::getNextByte_arith()
{
if(m_dwByteIdx + 1 < m_dwLength) {
return m_pBuf[m_dwByteIdx + 1];
@@ -297,11 +297,11 @@ inline void CJBig2_BitStream::setBitPos(FX_DWORD dwBitPos)
m_dwByteIdx = dwBitPos >> 3;
m_dwBitIdx = dwBitPos & 7;
}
-inline FX_BYTE *CJBig2_BitStream::getBuf()
+inline uint8_t *CJBig2_BitStream::getBuf()
{
return m_pBuf;
}
-inline FX_BYTE *CJBig2_BitStream::getPointer()
+inline uint8_t *CJBig2_BitStream::getPointer()
{
return m_pBuf + m_dwByteIdx;
}
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.cpp b/core/src/fxcodec/jbig2/JBig2_Context.cpp
index bcd16e7e14..1c7592778d 100644
--- a/core/src/fxcodec/jbig2/JBig2_Context.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Context.cpp
@@ -23,8 +23,8 @@ void OutputBitmap(CJBig2_Image* pImage)
return;
}
}
-CJBig2_Context *CJBig2_Context::CreateContext(CJBig2_Module *pModule, FX_BYTE *pGlobalData, FX_DWORD dwGlobalLength,
- FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause)
+CJBig2_Context *CJBig2_Context::CreateContext(CJBig2_Module *pModule, uint8_t *pGlobalData, FX_DWORD dwGlobalLength,
+ uint8_t *pData, FX_DWORD dwLength, int32_t nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause)
{
return new(pModule)CJBig2_Context(pGlobalData, dwGlobalLength, pData, dwLength, nStreamType, pSymbolDictCache, pPause);
}
@@ -34,8 +34,8 @@ void CJBig2_Context::DestroyContext(CJBig2_Context *pContext)
delete pContext;
}
}
-CJBig2_Context::CJBig2_Context(FX_BYTE *pGlobalData, FX_DWORD dwGlobalLength,
- FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause)
+CJBig2_Context::CJBig2_Context(uint8_t *pGlobalData, FX_DWORD dwGlobalLength,
+ uint8_t *pData, FX_DWORD dwLength, int32_t nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause)
{
if(pGlobalData && (dwGlobalLength > 0)) {
JBIG2_ALLOC(m_pGlobalContext, CJBig2_Context(NULL, 0, pGlobalData, dwGlobalLength,
@@ -96,12 +96,12 @@ CJBig2_Context::~CJBig2_Context()
}
m_pSegmentList = NULL;
}
-FX_INT32 CJBig2_Context::decodeFile(IFX_Pause* pPause)
+int32_t CJBig2_Context::decodeFile(IFX_Pause* pPause)
{
- FX_BYTE cFlags;
+ uint8_t cFlags;
FX_DWORD dwTemp;
- const FX_BYTE fileID[] = {0x97, 0x4A, 0x42, 0x32, 0x0D, 0x0A, 0x1A, 0x0A};
- FX_INT32 nRet;
+ const uint8_t fileID[] = {0x97, 0x4A, 0x42, 0x32, 0x0D, 0x0A, 0x1A, 0x0A};
+ int32_t nRet;
if(m_pStream->getByteLeft() < 8) {
m_pModule->JBig2_Error("file header too short.");
nRet = JBIG2_ERROR_TOO_SHORT;
@@ -139,9 +139,9 @@ FX_INT32 CJBig2_Context::decodeFile(IFX_Pause* pPause)
failed:
return nRet;
}
-FX_INT32 CJBig2_Context::decode_SquentialOrgnazation(IFX_Pause* pPause)
+int32_t CJBig2_Context::decode_SquentialOrgnazation(IFX_Pause* pPause)
{
- FX_INT32 nRet;
+ int32_t nRet;
if(m_pStream->getByteLeft() > 0) {
while(m_pStream->getByteLeft() >= JBIG2_MIN_SEGMENT_SIZE) {
if(m_pSegment == NULL) {
@@ -189,14 +189,14 @@ FX_INT32 CJBig2_Context::decode_SquentialOrgnazation(IFX_Pause* pPause)
}
return JBIG2_SUCCESS;
}
-FX_INT32 CJBig2_Context::decode_EmbedOrgnazation(IFX_Pause* pPause)
+int32_t CJBig2_Context::decode_EmbedOrgnazation(IFX_Pause* pPause)
{
return decode_SquentialOrgnazation(pPause);
}
-FX_INT32 CJBig2_Context::decode_RandomOrgnazation_FirstPage(IFX_Pause* pPause)
+int32_t CJBig2_Context::decode_RandomOrgnazation_FirstPage(IFX_Pause* pPause)
{
CJBig2_Segment *pSegment;
- FX_INT32 nRet;
+ int32_t nRet;
while(m_pStream->getByteLeft() > JBIG2_MIN_SEGMENT_SIZE) {
JBIG2_ALLOC(pSegment, CJBig2_Segment());
nRet = parseSegmentHeader(pSegment);
@@ -217,9 +217,9 @@ FX_INT32 CJBig2_Context::decode_RandomOrgnazation_FirstPage(IFX_Pause* pPause)
m_nSegmentDecoded = 0;
return decode_RandomOrgnazation(pPause);
}
-FX_INT32 CJBig2_Context::decode_RandomOrgnazation(IFX_Pause* pPause)
+int32_t CJBig2_Context::decode_RandomOrgnazation(IFX_Pause* pPause)
{
- FX_INT32 nRet;
+ int32_t nRet;
for(; m_nSegmentDecoded < m_pSegmentList->getLength(); m_nSegmentDecoded++) {
nRet = parseSegmentData(m_pSegmentList->getAt(m_nSegmentDecoded), pPause);
if((nRet == JBIG2_END_OF_PAGE) || (nRet == JBIG2_END_OF_FILE)) {
@@ -235,9 +235,9 @@ FX_INT32 CJBig2_Context::decode_RandomOrgnazation(IFX_Pause* pPause)
}
return JBIG2_SUCCESS;
}
-FX_INT32 CJBig2_Context::getFirstPage(FX_BYTE *pBuf, FX_INT32 width, FX_INT32 height, FX_INT32 stride, IFX_Pause* pPause)
+int32_t CJBig2_Context::getFirstPage(uint8_t *pBuf, int32_t width, int32_t height, int32_t stride, IFX_Pause* pPause)
{
- FX_INT32 nRet = 0;
+ int32_t nRet = 0;
if(m_pGlobalContext) {
nRet = m_pGlobalContext->decode_EmbedOrgnazation(pPause);
if(nRet != JBIG2_SUCCESS) {
@@ -260,10 +260,10 @@ FX_INT32 CJBig2_Context::getFirstPage(FX_BYTE *pBuf, FX_INT32 width, FX_INT32 he
int ret = Continue(pPause);
return ret;
}
-FX_INT32 CJBig2_Context::Continue(IFX_Pause* pPause)
+int32_t CJBig2_Context::Continue(IFX_Pause* pPause)
{
m_ProcessiveStatus = FXCODEC_STATUS_DECODE_READY;
- FX_INT32 nRet;
+ int32_t nRet;
if(m_PauseStep <= 1) {
switch(m_nStreamType) {
case JBIG2_FILE_STREAM:
@@ -311,9 +311,9 @@ FX_INT32 CJBig2_Context::Continue(IFX_Pause* pPause)
}
return nRet;
}
-FX_INT32 CJBig2_Context::getNextPage(FX_BYTE *pBuf, FX_INT32 width, FX_INT32 height, FX_INT32 stride, IFX_Pause* pPause)
+int32_t CJBig2_Context::getNextPage(uint8_t *pBuf, int32_t width, int32_t height, int32_t stride, IFX_Pause* pPause)
{
- FX_INT32 nRet = JBIG2_ERROR_STREAM_TYPE;
+ int32_t nRet = JBIG2_ERROR_STREAM_TYPE;
m_bFirstPage = FALSE;
m_PauseStep = 0;
if(m_pPage) {
@@ -345,9 +345,9 @@ FX_INT32 CJBig2_Context::getNextPage(FX_BYTE *pBuf, FX_INT32 width, FX_INT32 hei
}
return nRet;
}
-FX_INT32 CJBig2_Context::getFirstPage(CJBig2_Image **image, IFX_Pause* pPause)
+int32_t CJBig2_Context::getFirstPage(CJBig2_Image **image, IFX_Pause* pPause)
{
- FX_INT32 nRet;
+ int32_t nRet;
m_bFirstPage = TRUE;
m_PauseStep = 0;
if(m_pGlobalContext) {
@@ -359,9 +359,9 @@ FX_INT32 CJBig2_Context::getFirstPage(CJBig2_Image **image, IFX_Pause* pPause)
m_bBufSpecified = FALSE;
return Continue(pPause);
}
-FX_INT32 CJBig2_Context::getNextPage(CJBig2_Image **image, IFX_Pause* pPause)
+int32_t CJBig2_Context::getNextPage(CJBig2_Image **image, IFX_Pause* pPause)
{
- FX_INT32 nRet;
+ int32_t nRet;
m_bBufSpecified = FALSE;
m_bFirstPage = FALSE;
m_PauseStep = 0;
@@ -391,7 +391,7 @@ FX_INT32 CJBig2_Context::getNextPage(CJBig2_Image **image, IFX_Pause* pPause)
CJBig2_Segment *CJBig2_Context::findSegmentByNumber(FX_DWORD dwNumber)
{
CJBig2_Segment *pSeg;
- FX_INT32 i;
+ int32_t i;
if(m_pGlobalContext) {
pSeg = m_pGlobalContext->findSegmentByNumber(dwNumber);
if(pSeg) {
@@ -407,10 +407,10 @@ CJBig2_Segment *CJBig2_Context::findSegmentByNumber(FX_DWORD dwNumber)
return NULL;
}
CJBig2_Segment *CJBig2_Context::findReferredSegmentByTypeAndIndex(CJBig2_Segment *pSegment,
- FX_BYTE cType, FX_INT32 nIndex)
+ uint8_t cType, int32_t nIndex)
{
CJBig2_Segment *pSeg;
- FX_INT32 i, count;
+ int32_t i, count;
count = 0;
for(i = 0; i < pSegment->m_nReferred_to_segment_count; i++) {
pSeg = findSegmentByNumber(pSegment->m_pReferred_to_segment_numbers[i]);
@@ -424,10 +424,10 @@ CJBig2_Segment *CJBig2_Context::findReferredSegmentByTypeAndIndex(CJBig2_Segment
}
return NULL;
}
-FX_INT32 CJBig2_Context::parseSegmentHeader(CJBig2_Segment *pSegment)
+int32_t CJBig2_Context::parseSegmentHeader(CJBig2_Segment *pSegment)
{
- FX_BYTE cSSize, cPSize;
- FX_BYTE cTemp;
+ uint8_t cSSize, cPSize;
+ uint8_t cTemp;
FX_WORD wTemp;
FX_DWORD dwTemp;
if((m_pStream->readInteger(&pSegment->m_dwNumber) != 0)
@@ -457,7 +457,7 @@ FX_INT32 CJBig2_Context::parseSegmentHeader(CJBig2_Segment *pSegment)
if(pSegment->m_nReferred_to_segment_count) {
pSegment->m_pReferred_to_segment_numbers = (FX_DWORD*)m_pModule->JBig2_Malloc2(
sizeof(FX_DWORD), pSegment->m_nReferred_to_segment_count);
- for(FX_INT32 i = 0; i < pSegment->m_nReferred_to_segment_count; i++) {
+ for(int32_t i = 0; i < pSegment->m_nReferred_to_segment_count; i++) {
switch(cSSize) {
case 1:
if(m_pStream->read1Byte(&cTemp) != 0) {
@@ -504,15 +504,15 @@ failed:
m_pModule->JBig2_Error("header too short.");
return JBIG2_ERROR_TOO_SHORT;
}
-FX_INT32 CJBig2_Context::parseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause)
+int32_t CJBig2_Context::parseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause)
{
- FX_INT32 ret = ProcessiveParseSegmentData(pSegment, pPause);
+ int32_t ret = ProcessiveParseSegmentData(pSegment, pPause);
while(m_ProcessiveStatus == FXCODEC_STATUS_DECODE_TOBECONTINUE && m_pStream->getByteLeft() > 0) {
ret = ProcessiveParseSegmentData(pSegment, pPause);
}
return ret;
}
-FX_INT32 CJBig2_Context::ProcessiveParseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause)
+int32_t CJBig2_Context::ProcessiveParseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause)
{
switch(pSegment->m_cFlags.s.type) {
case 0:
@@ -613,13 +613,13 @@ failed2:
m_pModule->JBig2_Error("segment syntax error.");
return JBIG2_ERROR_FETAL;
}
-FX_INT32 CJBig2_Context::parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pPause)
+int32_t CJBig2_Context::parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pPause)
{
FX_DWORD dwTemp;
FX_WORD wFlags;
- FX_BYTE cSDHUFFDH, cSDHUFFDW, cSDHUFFBMSIZE, cSDHUFFAGGINST;
+ uint8_t cSDHUFFDH, cSDHUFFDW, cSDHUFFBMSIZE, cSDHUFFAGGINST;
CJBig2_HuffmanTable *Table_B1 = NULL, *Table_B2 = NULL, *Table_B3 = NULL, *Table_B4 = NULL, *Table_B5 = NULL;
- FX_INT32 i, nIndex, nRet;
+ int32_t i, nIndex, nRet;
CJBig2_Segment *pSeg = NULL, *pLRSeg = NULL;
FX_BOOL bUsed;
CJBig2_Image ** SDINSYMS = NULL;
@@ -627,7 +627,7 @@ FX_INT32 CJBig2_Context::parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pP
JBig2ArithCtx *gbContext = NULL, *grContext = NULL;
CJBig2_ArithDecoder *pArithDecoder;
JBIG2_ALLOC(pSymbolDictDecoder, CJBig2_SDDProc());
- FX_BYTE *key = pSegment->m_pData;
+ uint8_t *key = pSegment->m_pData;
FX_BOOL cache_hit = false;
if(m_pStream->readShortInteger(&wFlags) != 0) {
m_pModule->JBig2_Error("symbol dictionary segment : data header too short.");
@@ -648,8 +648,8 @@ FX_INT32 CJBig2_Context::parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pP
} else {
dwTemp = 2;
}
- for(i = 0; i < (FX_INT32)dwTemp; i++) {
- if(m_pStream->read1Byte((FX_BYTE*)&pSymbolDictDecoder->SDAT[i]) != 0) {
+ for(i = 0; i < (int32_t)dwTemp; i++) {
+ if(m_pStream->read1Byte((uint8_t*)&pSymbolDictDecoder->SDAT[i]) != 0) {
m_pModule->JBig2_Error("symbol dictionary segment : data header too short.");
nRet = JBIG2_ERROR_TOO_SHORT;
goto failed;
@@ -658,7 +658,7 @@ FX_INT32 CJBig2_Context::parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pP
}
if((pSymbolDictDecoder->SDREFAGG == 1) && (pSymbolDictDecoder->SDRTEMPLATE == 0)) {
for(i = 0; i < 4; i++) {
- if(m_pStream->read1Byte((FX_BYTE*)&pSymbolDictDecoder->SDRAT[i]) != 0) {
+ if(m_pStream->read1Byte((uint8_t*)&pSymbolDictDecoder->SDRAT[i]) != 0) {
m_pModule->JBig2_Error("symbol dictionary segment : data header too short.");
nRet = JBIG2_ERROR_TOO_SHORT;
goto failed;
@@ -917,12 +917,12 @@ FX_BOOL CJBig2_Context::parseTextRegion(CJBig2_Segment *pSegment)
{
FX_DWORD dwTemp;
FX_WORD wFlags;
- FX_INT32 i, nIndex, nRet;
+ int32_t i, nIndex, nRet;
JBig2RegionInfo ri;
CJBig2_Segment *pSeg;
CJBig2_Image **SBSYMS = NULL;
JBig2HuffmanCode *SBSYMCODES = NULL;
- FX_BYTE cSBHUFFFS, cSBHUFFDS, cSBHUFFDT, cSBHUFFRDW, cSBHUFFRDH, cSBHUFFRDX, cSBHUFFRDY, cSBHUFFRSIZE;
+ uint8_t cSBHUFFFS, cSBHUFFDS, cSBHUFFDT, cSBHUFFRDW, cSBHUFFRDH, cSBHUFFRDX, cSBHUFFRDY, cSBHUFFRSIZE;
CJBig2_HuffmanTable *Table_B1 = NULL,
*Table_B6 = NULL,
*Table_B7 = NULL,
@@ -976,7 +976,7 @@ FX_BOOL CJBig2_Context::parseTextRegion(CJBig2_Segment *pSegment)
}
if((pTRD->SBREFINE == 1) && (pTRD->SBRTEMPLATE == 0)) {
for(i = 0; i < 4; i++) {
- if(m_pStream->read1Byte((FX_BYTE*)&pTRD->SBRAT[i]) != 0) {
+ if(m_pStream->read1Byte((uint8_t*)&pTRD->SBRAT[i]) != 0) {
m_pModule->JBig2_Error("text region segment : data header too short.");
nRet = JBIG2_ERROR_TOO_SHORT;
goto failed;
@@ -1032,7 +1032,7 @@ FX_BOOL CJBig2_Context::parseTextRegion(CJBig2_Segment *pSegment)
while((FX_DWORD)(1 << dwTemp) < pTRD->SBNUMSYMS) {
dwTemp ++;
}
- pTRD->SBSYMCODELEN = (FX_BYTE)dwTemp;
+ pTRD->SBSYMCODELEN = (uint8_t)dwTemp;
}
if(pTRD->SBHUFF == 1) {
if((cSBHUFFFS == 2) || (cSBHUFFRDW == 2) || (cSBHUFFRDH == 2)
@@ -1326,11 +1326,11 @@ failed:
FX_BOOL CJBig2_Context::parsePatternDict(CJBig2_Segment *pSegment, IFX_Pause* pPause)
{
FX_DWORD dwTemp;
- FX_BYTE cFlags;
+ uint8_t cFlags;
JBig2ArithCtx *gbContext;
CJBig2_ArithDecoder *pArithDecoder;
CJBig2_PDDProc *pPDD;
- FX_INT32 nRet;
+ int32_t nRet;
JBIG2_ALLOC(pPDD, CJBig2_PDDProc());
if((m_pStream->read1Byte(&cFlags) != 0)
|| (m_pStream->read1Byte(&pPDD->HDPW) != 0)
@@ -1380,14 +1380,14 @@ failed:
FX_BOOL CJBig2_Context::parseHalftoneRegion(CJBig2_Segment *pSegment, IFX_Pause* pPause)
{
FX_DWORD dwTemp;
- FX_BYTE cFlags;
+ uint8_t cFlags;
JBig2RegionInfo ri;
CJBig2_Segment *pSeg;
CJBig2_PatternDict *pPatternDict;
JBig2ArithCtx *gbContext;
CJBig2_ArithDecoder *pArithDecoder;
CJBig2_HTRDProc *pHRD;
- FX_INT32 nRet;
+ int32_t nRet;
JBIG2_ALLOC(pHRD, CJBig2_HTRDProc());
if((parseRegionInfo(&ri) != JBIG2_SUCCESS)
|| (m_pStream->read1Byte(&cFlags) != 0)
@@ -1474,8 +1474,8 @@ failed:
FX_BOOL CJBig2_Context::parseGenericRegion(CJBig2_Segment *pSegment, IFX_Pause* pPause)
{
FX_DWORD dwTemp;
- FX_BYTE cFlags;
- FX_INT32 i, nRet;
+ uint8_t cFlags;
+ int32_t i, nRet;
if(m_pGRD == NULL) {
JBIG2_ALLOC(m_pGRD, CJBig2_GRDProc());
if((parseRegionInfo(&m_ri) != JBIG2_SUCCESS)
@@ -1497,7 +1497,7 @@ FX_BOOL CJBig2_Context::parseGenericRegion(CJBig2_Segment *pSegment, IFX_Pause*
if(m_pGRD->MMR == 0) {
if(m_pGRD->GBTEMPLATE == 0) {
for(i = 0; i < 8; i++) {
- if(m_pStream->read1Byte((FX_BYTE*)&m_pGRD->GBAT[i]) != 0) {
+ if(m_pStream->read1Byte((uint8_t*)&m_pGRD->GBAT[i]) != 0) {
m_pModule->JBig2_Error("generic region segment : data header too short.");
nRet = JBIG2_ERROR_TOO_SHORT;
goto failed;
@@ -1505,7 +1505,7 @@ FX_BOOL CJBig2_Context::parseGenericRegion(CJBig2_Segment *pSegment, IFX_Pause*
}
} else {
for(i = 0; i < 2; i++) {
- if(m_pStream->read1Byte((FX_BYTE*)&m_pGRD->GBAT[i]) != 0) {
+ if(m_pStream->read1Byte((uint8_t*)&m_pGRD->GBAT[i]) != 0) {
m_pModule->JBig2_Error("generic region segment : data header too short.");
nRet = JBIG2_ERROR_TOO_SHORT;
goto failed;
@@ -1593,8 +1593,8 @@ FX_BOOL CJBig2_Context::parseGenericRefinementRegion(CJBig2_Segment *pSegment)
FX_DWORD dwTemp;
JBig2RegionInfo ri;
CJBig2_Segment *pSeg;
- FX_INT32 i, nRet;
- FX_BYTE cFlags;
+ int32_t i, nRet;
+ uint8_t cFlags;
JBig2ArithCtx *grContext;
CJBig2_GRRDProc *pGRRD;
CJBig2_ArithDecoder *pArithDecoder;
@@ -1611,7 +1611,7 @@ FX_BOOL CJBig2_Context::parseGenericRefinementRegion(CJBig2_Segment *pSegment)
pGRRD->TPGRON = (cFlags >> 1) & 0x01;
if(pGRRD->GRTEMPLATE == 0) {
for(i = 0; i < 4; i++) {
- if(m_pStream->read1Byte((FX_BYTE*)&pGRRD->GRAT[i]) != 0) {
+ if(m_pStream->read1Byte((uint8_t*)&pGRRD->GRAT[i]) != 0) {
m_pModule->JBig2_Error("generic refinement region segment : data header too short.");
nRet = JBIG2_ERROR_TOO_SHORT;
goto failed;
@@ -1687,7 +1687,7 @@ FX_BOOL CJBig2_Context::parseTable(CJBig2_Segment *pSegment)
m_pStream->alignByte();
return JBIG2_SUCCESS;
}
-FX_INT32 CJBig2_Context::parseRegionInfo(JBig2RegionInfo *pRI)
+int32_t CJBig2_Context::parseRegionInfo(JBig2RegionInfo *pRI)
{
if((m_pStream->readInteger((FX_DWORD*)&pRI->width) != 0)
|| (m_pStream->readInteger((FX_DWORD*)&pRI->height) != 0)
@@ -1702,9 +1702,9 @@ JBig2HuffmanCode *CJBig2_Context::decodeSymbolIDHuffmanTable(CJBig2_BitStream *p
FX_DWORD SBNUMSYMS)
{
JBig2HuffmanCode *SBSYMCODES;
- FX_INT32 runcodes[35], runcodes_len[35], runcode;
- FX_INT32 i, j, nTemp, nVal, nBits;
- FX_INT32 run;
+ int32_t runcodes[35], runcodes_len[35], runcode;
+ int32_t i, j, nTemp, nVal, nBits;
+ int32_t run;
SBSYMCODES = (JBig2HuffmanCode*)m_pModule->JBig2_Malloc2(sizeof(JBig2HuffmanCode), SBNUMSYMS);
for (i = 0; i < 35; i ++) {
if(pStream->readNBits(4, &runcodes_len[i]) != 0) {
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h
index f46530e005..b12853accf 100644
--- a/core/src/fxcodec/jbig2/JBig2_Context.h
+++ b/core/src/fxcodec/jbig2/JBig2_Context.h
@@ -14,7 +14,7 @@
#include "../../../include/fxcodec/fx_codec_def.h"
#include "../../../include/fxcrt/fx_basic.h"
#include <utility>
-typedef std::pair<FX_BYTE*, CJBig2_SymbolDict*> CJBig2_CachePair;
+typedef std::pair<uint8_t*, CJBig2_SymbolDict*> CJBig2_CachePair;
typedef enum {
JBIG2_OUT_OF_PAGE = 0,
JBIG2_IN_PAGE,
@@ -37,64 +37,64 @@ class CJBig2_Context : public CJBig2_Object
{
public:
- static CJBig2_Context *CreateContext(CJBig2_Module *pModule, FX_BYTE *pGlobalData, FX_DWORD dwGlobalLength,
- FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause = NULL);
+ static CJBig2_Context *CreateContext(CJBig2_Module *pModule, uint8_t *pGlobalData, FX_DWORD dwGlobalLength,
+ uint8_t *pData, FX_DWORD dwLength, int32_t nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause = NULL);
static void DestroyContext(CJBig2_Context *pContext);
- FX_INT32 getFirstPage(FX_BYTE *pBuf, FX_INT32 width, FX_INT32 height, FX_INT32 stride, IFX_Pause* pPause);
+ int32_t getFirstPage(uint8_t *pBuf, int32_t width, int32_t height, int32_t stride, IFX_Pause* pPause);
- FX_INT32 getNextPage(FX_BYTE *pBuf, FX_INT32 width, FX_INT32 height, FX_INT32 stride, IFX_Pause* pPause);
+ int32_t getNextPage(uint8_t *pBuf, int32_t width, int32_t height, int32_t stride, IFX_Pause* pPause);
- FX_INT32 getFirstPage(CJBig2_Image **image, IFX_Pause* pPause);
+ int32_t getFirstPage(CJBig2_Image **image, IFX_Pause* pPause);
- FX_INT32 getNextPage(CJBig2_Image **image, IFX_Pause* pPause);
- FX_INT32 Continue(IFX_Pause* pPause);
+ int32_t getNextPage(CJBig2_Image **image, IFX_Pause* pPause);
+ int32_t Continue(IFX_Pause* pPause);
FXCODEC_STATUS GetProcessiveStatus()
{
return m_ProcessiveStatus;
};
private:
- CJBig2_Context(FX_BYTE *pGlobalData, FX_DWORD dwGlobalLength,
- FX_BYTE *pData, FX_DWORD dwLength, FX_INT32 nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause);
+ CJBig2_Context(uint8_t *pGlobalData, FX_DWORD dwGlobalLength,
+ uint8_t *pData, FX_DWORD dwLength, int32_t nStreamType, std::list<CJBig2_CachePair>* pSymbolDictCache, IFX_Pause* pPause);
~CJBig2_Context();
- FX_INT32 decodeFile(IFX_Pause* pPause);
+ int32_t decodeFile(IFX_Pause* pPause);
- FX_INT32 decode_SquentialOrgnazation(IFX_Pause* pPause);
+ int32_t decode_SquentialOrgnazation(IFX_Pause* pPause);
- FX_INT32 decode_EmbedOrgnazation(IFX_Pause* pPause);
+ int32_t decode_EmbedOrgnazation(IFX_Pause* pPause);
- FX_INT32 decode_RandomOrgnazation_FirstPage(IFX_Pause* pPause);
+ int32_t decode_RandomOrgnazation_FirstPage(IFX_Pause* pPause);
- FX_INT32 decode_RandomOrgnazation(IFX_Pause* pPause);
+ int32_t decode_RandomOrgnazation(IFX_Pause* pPause);
CJBig2_Segment *findSegmentByNumber(FX_DWORD dwNumber);
- CJBig2_Segment *findReferredSegmentByTypeAndIndex(CJBig2_Segment *pSegment, FX_BYTE cType, FX_INT32 nIndex);
+ CJBig2_Segment *findReferredSegmentByTypeAndIndex(CJBig2_Segment *pSegment, uint8_t cType, int32_t nIndex);
- FX_INT32 parseSegmentHeader(CJBig2_Segment *pSegment);
+ int32_t parseSegmentHeader(CJBig2_Segment *pSegment);
- FX_INT32 parseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause);
- FX_INT32 ProcessiveParseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause);
+ int32_t parseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause);
+ int32_t ProcessiveParseSegmentData(CJBig2_Segment *pSegment, IFX_Pause* pPause);
- FX_INT32 parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pPause);
+ int32_t parseSymbolDict(CJBig2_Segment *pSegment, IFX_Pause* pPause);
- FX_INT32 parseTextRegion(CJBig2_Segment *pSegment);
+ int32_t parseTextRegion(CJBig2_Segment *pSegment);
- FX_INT32 parsePatternDict(CJBig2_Segment *pSegment, IFX_Pause* pPause);
+ int32_t parsePatternDict(CJBig2_Segment *pSegment, IFX_Pause* pPause);
- FX_INT32 parseHalftoneRegion(CJBig2_Segment *pSegment, IFX_Pause* pPause);
+ int32_t parseHalftoneRegion(CJBig2_Segment *pSegment, IFX_Pause* pPause);
- FX_INT32 parseGenericRegion(CJBig2_Segment *pSegment, IFX_Pause* pPause);
+ int32_t parseGenericRegion(CJBig2_Segment *pSegment, IFX_Pause* pPause);
- FX_INT32 parseGenericRefinementRegion(CJBig2_Segment *pSegment);
+ int32_t parseGenericRefinementRegion(CJBig2_Segment *pSegment);
- FX_INT32 parseTable(CJBig2_Segment *pSegment);
+ int32_t parseTable(CJBig2_Segment *pSegment);
- FX_INT32 parseRegionInfo(JBig2RegionInfo *pRI);
+ int32_t parseRegionInfo(JBig2RegionInfo *pRI);
@@ -108,11 +108,11 @@ private:
CJBig2_Context *m_pGlobalContext;
- FX_INT32 m_nStreamType;
+ int32_t m_nStreamType;
CJBig2_BitStream *m_pStream;
- FX_INT32 m_nState;
+ int32_t m_nState;
CJBig2_List<CJBig2_Segment> *m_pSegmentList;
@@ -122,9 +122,9 @@ private:
FX_BOOL m_bBufSpecified;
- FX_INT32 m_nSegmentDecoded;
+ int32_t m_nSegmentDecoded;
IFX_Pause* m_pPause;
- FX_INT32 m_PauseStep;
+ int32_t m_PauseStep;
FXCODEC_STATUS m_ProcessiveStatus;
FX_BOOL m_bFirstPage;
CJBig2_ArithDecoder *m_pArithDecoder;
diff --git a/core/src/fxcodec/jbig2/JBig2_Define.h b/core/src/fxcodec/jbig2/JBig2_Define.h
index ccf15d07ba..46c6e2b532 100644
--- a/core/src/fxcodec/jbig2/JBig2_Define.h
+++ b/core/src/fxcodec/jbig2/JBig2_Define.h
@@ -13,15 +13,15 @@
#include "JBig2_Object.h"
#define JBIG2_OOB 1
typedef struct {
- FX_INT32 width,
+ int32_t width,
height;
- FX_INT32 x,
+ int32_t x,
y;
- FX_BYTE flags;
+ uint8_t flags;
} JBig2RegionInfo;
typedef struct {
- FX_INT32 codelen;
- FX_INT32 code;
+ int32_t codelen;
+ int32_t code;
} JBig2HuffmanCode;
extern "C" {
void _FaxG4Decode(void *pModule, FX_LPCBYTE src_buf, FX_DWORD src_size, int* pbitpos, FX_LPBYTE dest_buf, int width, int height, int pitch = 0);
diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp
index a5928f9ea3..bad595e6b7 100644
--- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp
@@ -150,9 +150,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template0_opt2(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1, line2;
- FX_BYTE *pLine, cVal;
- FX_INTPTR nStride, nStride2;
- FX_INT32 nBits, k;
+ uint8_t *pLine, cVal;
+ intptr_t nStride, nStride2;
+ int32_t nBits, k;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -217,9 +217,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template0_opt3(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1, line2;
- FX_BYTE *pLine, *pLine1, *pLine2, cVal;
- FX_INT32 nStride, nStride2, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine, *pLine1, *pLine2, cVal;
+ int32_t nStride, nStride2, k;
+ int32_t nLineBytes, nBitsLeft, cc;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -401,9 +401,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template1_opt2(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1, line2;
- FX_BYTE *pLine, cVal;
- FX_INTPTR nStride, nStride2;
- FX_INT32 nBits, k;
+ uint8_t *pLine, cVal;
+ intptr_t nStride, nStride2;
+ int32_t nBits, k;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -468,9 +468,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template1_opt3(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1, line2;
- FX_BYTE *pLine, *pLine1, *pLine2, cVal;
- FX_INT32 nStride, nStride2, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine, *pLine1, *pLine2, cVal;
+ int32_t nStride, nStride2, k;
+ int32_t nLineBytes, nBitsLeft, cc;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -647,9 +647,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template2_opt2(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1, line2;
- FX_BYTE *pLine, cVal;
- FX_INTPTR nStride, nStride2;
- FX_INT32 nBits, k;
+ uint8_t *pLine, cVal;
+ intptr_t nStride, nStride2;
+ int32_t nBits, k;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -714,9 +714,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template2_opt3(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1, line2;
- FX_BYTE *pLine, *pLine1, *pLine2, cVal;
- FX_INT32 nStride, nStride2, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine, *pLine1, *pLine2, cVal;
+ int32_t nStride, nStride2, k;
+ int32_t nLineBytes, nBitsLeft, cc;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -887,9 +887,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template3_opt2(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1;
- FX_BYTE *pLine, cVal;
- FX_INTPTR nStride;
- FX_INT32 nBits, k;
+ uint8_t *pLine, cVal;
+ intptr_t nStride;
+ int32_t nBits, k;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -945,9 +945,9 @@ CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template3_opt3(CJBig2_ArithDecoder *p
FX_DWORD CONTEXT;
CJBig2_Image *GBREG;
FX_DWORD line1;
- FX_BYTE *pLine, *pLine1, cVal;
- FX_INT32 nStride, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine, *pLine1, cVal;
+ int32_t nStride, k;
+ int32_t nLineBytes, nBitsLeft, cc;
LTP = 0;
JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
if (GBREG->m_pData == NULL) {
@@ -1428,13 +1428,13 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template0_opt(CJBig2_ArithDecoder *pArithD
FX_DWORD CONTEXT;
CJBig2_Image *GRREG;
FX_DWORD line1, line1_r, line2_r, line3_r;
- FX_BYTE *pLine, *pLineR, cVal;
- FX_INTPTR nStride, nStrideR, nOffset;
- FX_INT32 k, nBits;
- FX_INT32 GRWR, GRHR;
- FX_INT32 GRW, GRH;
- GRW = (FX_INT32)CJBig2_GRRDProc::GRW;
- GRH = (FX_INT32)CJBig2_GRRDProc::GRH;
+ uint8_t *pLine, *pLineR, cVal;
+ intptr_t nStride, nStrideR, nOffset;
+ int32_t k, nBits;
+ int32_t GRWR, GRHR;
+ int32_t GRW, GRH;
+ GRW = (int32_t)CJBig2_GRRDProc::GRW;
+ GRH = (int32_t)CJBig2_GRRDProc::GRH;
LTP = 0;
JBIG2_ALLOC(GRREG, CJBig2_Image(GRW, GRH));
if (GRREG->m_pData == NULL) {
@@ -1446,19 +1446,19 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template0_opt(CJBig2_ArithDecoder *pArithD
pLineR = GRREFERENCE->m_pData;
nStride = GRREG->m_nStride;
nStrideR = GRREFERENCE->m_nStride;
- GRWR = (FX_INT32)GRREFERENCE->m_nWidth;
- GRHR = (FX_INT32)GRREFERENCE->m_nHeight;
+ GRWR = (int32_t)GRREFERENCE->m_nWidth;
+ GRHR = (int32_t)GRREFERENCE->m_nHeight;
if (GRREFERENCEDY < -GRHR + 1 || GRREFERENCEDY > GRHR - 1) {
GRREFERENCEDY = 0;
}
nOffset = -GRREFERENCEDY * nStrideR;
- for (FX_INT32 h = 0; h < GRH; h++) {
+ for (int32_t h = 0; h < GRH; h++) {
if(TPGRON) {
SLTP = pArithDecoder->DECODE(&grContext[0x0010]);
LTP = LTP ^ SLTP;
}
line1 = (h > 0) ? pLine[-nStride] << 4 : 0;
- FX_INT32 reference_h = h - GRREFERENCEDY;
+ int32_t reference_h = h - GRREFERENCEDY;
FX_BOOL line1_r_ok = (reference_h > 0 && reference_h < GRHR + 1);
FX_BOOL line2_r_ok = (reference_h > -1 && reference_h < GRHR);
FX_BOOL line3_r_ok = (reference_h > -2 && reference_h < GRHR - 1);
@@ -1468,7 +1468,7 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template0_opt(CJBig2_ArithDecoder *pArithD
if(LTP == 0) {
CONTEXT = (line1 & 0x1c00) | (line1_r & 0x01c0)
| ((line2_r >> 3) & 0x0038) | ((line3_r >> 6) & 0x0007);
- for (FX_INT32 w = 0; w < GRW; w += 8) {
+ for (int32_t w = 0; w < GRW; w += 8) {
nBits = GRW - w > 8 ? 8 : GRW - w;
if (h > 0)
line1 = (line1 << 8) |
@@ -1506,7 +1506,7 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template0_opt(CJBig2_ArithDecoder *pArithD
} else {
CONTEXT = (line1 & 0x1c00) | (line1_r & 0x01c0)
| ((line2_r >> 3) & 0x0038) | ((line3_r >> 6) & 0x0007);
- for (FX_INT32 w = 0; w < GRW; w += 8) {
+ for (int32_t w = 0; w < GRW; w += 8) {
nBits = GRW - w > 8 ? 8 : GRW - w;
if (h > 0)
line1 = (line1 << 8) |
@@ -1637,13 +1637,13 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template1_opt(CJBig2_ArithDecoder *pArithD
FX_DWORD CONTEXT;
CJBig2_Image *GRREG;
FX_DWORD line1, line1_r, line2_r, line3_r;
- FX_BYTE *pLine, *pLineR, cVal;
- FX_INTPTR nStride, nStrideR, nOffset;
- FX_INT32 k, nBits;
- FX_INT32 GRWR, GRHR;
- FX_INT32 GRW, GRH;
- GRW = (FX_INT32)CJBig2_GRRDProc::GRW;
- GRH = (FX_INT32)CJBig2_GRRDProc::GRH;
+ uint8_t *pLine, *pLineR, cVal;
+ intptr_t nStride, nStrideR, nOffset;
+ int32_t k, nBits;
+ int32_t GRWR, GRHR;
+ int32_t GRW, GRH;
+ GRW = (int32_t)CJBig2_GRRDProc::GRW;
+ GRH = (int32_t)CJBig2_GRRDProc::GRH;
LTP = 0;
JBIG2_ALLOC(GRREG, CJBig2_Image(GRW, GRH));
if (GRREG->m_pData == NULL) {
@@ -1655,19 +1655,19 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template1_opt(CJBig2_ArithDecoder *pArithD
pLineR = GRREFERENCE->m_pData;
nStride = GRREG->m_nStride;
nStrideR = GRREFERENCE->m_nStride;
- GRWR = (FX_INT32)GRREFERENCE->m_nWidth;
- GRHR = (FX_INT32)GRREFERENCE->m_nHeight;
+ GRWR = (int32_t)GRREFERENCE->m_nWidth;
+ GRHR = (int32_t)GRREFERENCE->m_nHeight;
if (GRREFERENCEDY < -GRHR + 1 || GRREFERENCEDY > GRHR - 1) {
GRREFERENCEDY = 0;
}
nOffset = -GRREFERENCEDY * nStrideR;
- for (FX_INT32 h = 0; h < GRH; h++) {
+ for (int32_t h = 0; h < GRH; h++) {
if(TPGRON) {
SLTP = pArithDecoder->DECODE(&grContext[0x0008]);
LTP = LTP ^ SLTP;
}
line1 = (h > 0) ? pLine[-nStride] << 1 : 0;
- FX_INT32 reference_h = h - GRREFERENCEDY;
+ int32_t reference_h = h - GRREFERENCEDY;
FX_BOOL line1_r_ok = (reference_h > 0 && reference_h < GRHR + 1);
FX_BOOL line2_r_ok = (reference_h > -1 && reference_h < GRHR);
FX_BOOL line3_r_ok = (reference_h > -2 && reference_h < GRHR - 1);
@@ -1677,7 +1677,7 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template1_opt(CJBig2_ArithDecoder *pArithD
if(LTP == 0) {
CONTEXT = (line1 & 0x0380) | ((line1_r >> 2) & 0x0020)
| ((line2_r >> 4) & 0x001c) | ((line3_r >> 6) & 0x0003);
- for (FX_INT32 w = 0; w < GRW; w += 8) {
+ for (int32_t w = 0; w < GRW; w += 8) {
nBits = GRW - w > 8 ? 8 : GRW - w;
if (h > 0)
line1 = (line1 << 8) |
@@ -1709,7 +1709,7 @@ CJBig2_Image *CJBig2_GRRDProc::decode_Template1_opt(CJBig2_ArithDecoder *pArithD
} else {
CONTEXT = (line1 & 0x0380) | ((line1_r >> 2) & 0x0020)
| ((line2_r >> 4) & 0x001c) | ((line3_r >> 6) & 0x0003);
- for (FX_INT32 w = 0; w < GRW; w += 8) {
+ for (int32_t w = 0; w < GRW; w += 8) {
nBits = GRW - w > 8 ? 8 : GRW - w;
if (h > 0)
line1 = (line1 << 8) |
@@ -1872,23 +1872,23 @@ CJBig2_Image *CJBig2_GRRDProc::decode_V1(CJBig2_ArithDecoder *pArithDecoder, JBi
}
CJBig2_Image *CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream *pStream, JBig2ArithCtx *grContext)
{
- FX_INT32 STRIPT, FIRSTS;
+ int32_t STRIPT, FIRSTS;
FX_DWORD NINSTANCES;
- FX_INT32 DT, DFS, CURS;
- FX_BYTE CURT;
- FX_INT32 SI, TI;
+ int32_t DT, DFS, CURS;
+ uint8_t CURT;
+ int32_t SI, TI;
FX_DWORD IDI;
CJBig2_Image *IBI;
FX_DWORD WI, HI;
- FX_INT32 IDS;
+ int32_t IDS;
FX_BOOL RI;
- FX_INT32 RDWI, RDHI, RDXI, RDYI;
+ int32_t RDWI, RDHI, RDXI, RDYI;
CJBig2_Image *IBOI;
FX_DWORD WOI, HOI;
CJBig2_Image *SBREG;
FX_BOOL bFirst;
FX_DWORD nTmp;
- FX_INT32 nVal, nBits;
+ int32_t nVal, nBits;
CJBig2_HuffmanDecoder *pHuffmanDecoder;
CJBig2_GRRDProc *pGRRD;
CJBig2_ArithDecoder *pArithDecoder;
@@ -2092,23 +2092,23 @@ failed:
CJBig2_Image *CJBig2_TRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext,
JBig2IntDecoderState *pIDS)
{
- FX_INT32 STRIPT, FIRSTS;
+ int32_t STRIPT, FIRSTS;
FX_DWORD NINSTANCES;
- FX_INT32 DT, DFS, CURS;
- FX_INT32 CURT;
- FX_INT32 SI, TI;
+ int32_t DT, DFS, CURS;
+ int32_t CURT;
+ int32_t SI, TI;
FX_DWORD IDI;
CJBig2_Image *IBI;
FX_DWORD WI, HI;
- FX_INT32 IDS;
+ int32_t IDS;
FX_BOOL RI;
- FX_INT32 RDWI, RDHI, RDXI, RDYI;
+ int32_t RDWI, RDHI, RDXI, RDYI;
CJBig2_Image *IBOI;
FX_DWORD WOI, HOI;
CJBig2_Image *SBREG;
FX_BOOL bFirst;
- FX_INT32 nRet, nVal;
- FX_INT32 bRetained;
+ int32_t nRet, nVal;
+ int32_t bRetained;
CJBig2_ArithIntDecoder *IADT, *IAFS, *IADS, *IAIT, *IARI, *IARDW, *IARDH, *IARDX, *IARDY;
CJBig2_ArithIaidDecoder *IAID;
CJBig2_GRRDProc *pGRRD;
@@ -2333,21 +2333,21 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecod
{
CJBig2_Image **SDNEWSYMS;
FX_DWORD HCHEIGHT, NSYMSDECODED;
- FX_INT32 HCDH;
+ int32_t HCDH;
FX_DWORD SYMWIDTH, TOTWIDTH;
- FX_INT32 DW;
+ int32_t DW;
CJBig2_Image *BS;
FX_DWORD I, J, REFAGGNINST;
FX_BOOL *EXFLAGS;
FX_DWORD EXINDEX;
FX_BOOL CUREXFLAG;
FX_DWORD EXRUNLENGTH;
- FX_INT32 nVal;
+ int32_t nVal;
FX_DWORD nTmp;
FX_DWORD SBNUMSYMS;
- FX_BYTE SBSYMCODELEN;
+ uint8_t SBSYMCODELEN;
FX_DWORD IDI;
- FX_INT32 RDXI, RDYI;
+ int32_t RDXI, RDYI;
CJBig2_Image **SBSYMS;
CJBig2_HuffmanTable *SBHUFFFS, *SBHUFFDS, *SBHUFFDT, *SBHUFFRDW, *SBHUFFRDH, *SBHUFFRDX, *SBHUFFRDY,
*SBHUFFRSIZE;
@@ -2374,7 +2374,7 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecod
while((FX_DWORD)(1 << nTmp) < (SDNUMINSYMS + SDNUMNEWSYMS)) {
nTmp ++;
}
- JBIG2_ALLOC(IAID, CJBig2_ArithIaidDecoder((FX_BYTE)nTmp));
+ JBIG2_ALLOC(IAID, CJBig2_ArithIaidDecoder((uint8_t)nTmp));
SDNEWSYMS = (CJBig2_Image**)m_pModule->JBig2_Malloc2(SDNUMNEWSYMS, sizeof(CJBig2_Image*));
FXSYS_memset32(SDNEWSYMS, 0 , SDNUMNEWSYMS * sizeof(CJBig2_Image*));
HCHEIGHT = 0;
@@ -2458,7 +2458,7 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecod
while((FX_DWORD)(1 << nTmp) < SBNUMSYMS) {
nTmp ++;
}
- SBSYMCODELEN = (FX_BYTE)nTmp;
+ SBSYMCODELEN = (uint8_t)nTmp;
pDecoder->SBSYMCODELEN = SBSYMCODELEN;
SBSYMS = (CJBig2_Image**)m_pModule->JBig2_Malloc2(SBNUMSYMS, sizeof(CJBig2_Image*));
JBIG2_memcpy(SBSYMS, SDINSYMS, SDNUMINSYMS * sizeof(CJBig2_Image*));
@@ -2671,22 +2671,22 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Huffman(CJBig2_BitStream *pStream,
CJBig2_Image **SDNEWSYMS;
FX_DWORD *SDNEWSYMWIDTHS;
FX_DWORD HCHEIGHT, NSYMSDECODED;
- FX_INT32 HCDH;
+ int32_t HCDH;
FX_DWORD SYMWIDTH, TOTWIDTH, HCFIRSTSYM;
- FX_INT32 DW;
+ int32_t DW;
CJBig2_Image *BS, *BHC;
FX_DWORD I, J, REFAGGNINST;
FX_BOOL *EXFLAGS;
FX_DWORD EXINDEX;
FX_BOOL CUREXFLAG;
FX_DWORD EXRUNLENGTH;
- FX_INT32 nVal, nBits;
+ int32_t nVal, nBits;
FX_DWORD nTmp;
FX_DWORD SBNUMSYMS;
- FX_BYTE SBSYMCODELEN;
+ uint8_t SBSYMCODELEN;
JBig2HuffmanCode *SBSYMCODES;
FX_DWORD IDI;
- FX_INT32 RDXI, RDYI;
+ int32_t RDXI, RDYI;
FX_DWORD BMSIZE;
FX_DWORD stride;
CJBig2_Image **SBSYMS;
@@ -2843,7 +2843,7 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Huffman(CJBig2_BitStream *pStream,
while((FX_DWORD)(1 << nTmp) < SBNUMSYMS) {
nTmp ++;
}
- SBSYMCODELEN = (FX_BYTE)nTmp;
+ SBSYMCODELEN = (uint8_t)nTmp;
SBSYMCODES = (JBig2HuffmanCode*)m_pModule->JBig2_Malloc2(SBNUMSYMS, sizeof(JBig2HuffmanCode));
for(I = 0; I < SBNUMSYMS; I++) {
SBSYMCODES[I].codelen = SBSYMCODELEN;
@@ -2931,7 +2931,7 @@ CJBig2_SymbolDict *CJBig2_SDDProc::decode_Huffman(CJBig2_BitStream *pStream,
NSYMSDECODED = NSYMSDECODED + 1;
}
if(SDREFAGG == 0) {
- if(pHuffmanDecoder->decodeAValue(SDHUFFBMSIZE, (FX_INT32*)&BMSIZE) != 0) {
+ if(pHuffmanDecoder->decodeAValue(SDHUFFBMSIZE, (int32_t*)&BMSIZE) != 0) {
m_pModule->JBig2_Error("symbol dictionary decoding procedure (huffman): too short.");
goto failed;
}
@@ -3042,7 +3042,7 @@ CJBig2_Image *CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
JBig2ArithCtx *gbContext, IFX_Pause* pPause)
{
FX_DWORD ng, mg;
- FX_INT32 x, y;
+ int32_t x, y;
CJBig2_Image *HSKIP;
FX_DWORD HBPP;
FX_DWORD *GI;
@@ -3057,8 +3057,8 @@ CJBig2_Image *CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
for(ng = 0; ng < HGW; ng++) {
x = (HGX + mg * HRY + ng * HRX) >> 8;
y = (HGY + mg * HRX - ng * HRY) >> 8;
- if((x + HPW <= 0) | (x >= (FX_INT32)HBW)
- | (y + HPH <= 0) | (y >= (FX_INT32)HPH)) {
+ if((x + HPW <= 0) | (x >= (int32_t)HBW)
+ | (y + HPH <= 0) | (y >= (int32_t)HPH)) {
HSKIP->setPixel(ng, mg, 1);
} else {
HSKIP->setPixel(ng, mg, 0);
@@ -3074,7 +3074,7 @@ CJBig2_Image *CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
pGID->GSMMR = HMMR;
pGID->GSW = HGW;
pGID->GSH = HGH;
- pGID->GSBPP = (FX_BYTE)HBPP;
+ pGID->GSBPP = (uint8_t)HBPP;
pGID->GSUSESKIP = HENABLESKIP;
pGID->GSKIP = HSKIP;
pGID->GSTEMPLATE = HTEMPLATE;
@@ -3110,7 +3110,7 @@ failed:
CJBig2_Image *CJBig2_HTRDProc::decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause)
{
FX_DWORD ng, mg;
- FX_INT32 x, y;
+ int32_t x, y;
FX_DWORD HBPP;
FX_DWORD *GI;
CJBig2_Image *HTREG;
@@ -3125,7 +3125,7 @@ CJBig2_Image *CJBig2_HTRDProc::decode_MMR(CJBig2_BitStream *pStream, IFX_Pause*
pGID->GSMMR = HMMR;
pGID->GSW = HGW;
pGID->GSH = HGH;
- pGID->GSBPP = (FX_BYTE)HBPP;
+ pGID->GSBPP = (uint8_t)HBPP;
pGID->GSUSESKIP = 0;
GI = pGID->decode_MMR(pStream, pPause);
if(GI == NULL) {
@@ -3168,7 +3168,7 @@ CJBig2_PatternDict *CJBig2_PDDProc::decode_Arith(CJBig2_ArithDecoder *pArithDeco
pGRD->GBTEMPLATE = HDTEMPLATE;
pGRD->TPGDON = 0;
pGRD->USESKIP = 0;
- pGRD->GBAT[0] = -(FX_INT32)HDPW;
+ pGRD->GBAT[0] = -(int32_t)HDPW;
pGRD->GBAT[1] = 0;
if(pGRD->GBTEMPLATE == 0) {
pGRD->GBAT[2] = -3;
@@ -3237,7 +3237,7 @@ FX_DWORD *CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
JBig2ArithCtx *gbContext, IFX_Pause* pPause)
{
CJBig2_Image **GSPLANES;
- FX_INT32 J, K;
+ int32_t J, K;
FX_DWORD x, y;
FX_DWORD *GSVALS;
CJBig2_GRDProc *pGRD;
@@ -3318,7 +3318,7 @@ failed:
FX_DWORD *CJBig2_GSIDProc::decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause)
{
CJBig2_Image **GSPLANES;
- FX_INT32 J, K;
+ int32_t J, K;
FX_DWORD x, y;
FX_DWORD *GSVALS;
CJBig2_GRDProc *pGRD;
@@ -3808,9 +3808,9 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template0_opt3(CJBig2_Image *pImage,
FX_BOOL SLTP, bVal;
FX_DWORD CONTEXT;
FX_DWORD line1, line2;
- FX_BYTE *pLine1, *pLine2, cVal;
- FX_INT32 nStride, nStride2, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine1, *pLine2, cVal;
+ int32_t nStride, nStride2, k;
+ int32_t nLineBytes, nBitsLeft, cc;
if(m_pLine == NULL) {
m_pLine = pImage->m_pData;
}
@@ -3949,9 +3949,9 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template1_opt3(CJBig2_Image *pImage,
FX_BOOL SLTP, bVal;
FX_DWORD CONTEXT;
FX_DWORD line1, line2;
- FX_BYTE *pLine1, *pLine2, cVal;
- FX_INT32 nStride, nStride2, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine1, *pLine2, cVal;
+ int32_t nStride, nStride2, k;
+ int32_t nLineBytes, nBitsLeft, cc;
if (!m_pLine) {
m_pLine = pImage->m_pData;
}
@@ -4087,9 +4087,9 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template2_opt3(CJBig2_Image *pImage,
FX_BOOL SLTP, bVal;
FX_DWORD CONTEXT;
FX_DWORD line1, line2;
- FX_BYTE *pLine1, *pLine2, cVal;
- FX_INT32 nStride, nStride2, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine1, *pLine2, cVal;
+ int32_t nStride, nStride2, k;
+ int32_t nLineBytes, nBitsLeft, cc;
if(!m_pLine) {
m_pLine = pImage->m_pData;
}
@@ -4223,9 +4223,9 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template3_opt3(CJBig2_Image *pImage,
FX_BOOL SLTP, bVal;
FX_DWORD CONTEXT;
FX_DWORD line1;
- FX_BYTE *pLine1, cVal;
- FX_INT32 nStride, k;
- FX_INT32 nLineBytes, nBitsLeft, cc;
+ uint8_t *pLine1, cVal;
+ int32_t nStride, k;
+ int32_t nLineBytes, nBitsLeft, cc;
if (!m_pLine) {
m_pLine = pImage->m_pData;
}
diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
index 3f43c979a5..45e2940d3a 100644
--- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h
@@ -68,7 +68,7 @@ private:
FXCODEC_STATUS decode_Arith_Template3_opt3(CJBig2_Image *pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
FXCODEC_STATUS decode_Arith_Template3_unopt(CJBig2_Image * pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause);
FX_DWORD m_loopIndex;
- FX_BYTE * m_pLine;
+ uint8_t * m_pLine;
IFX_Pause* m_pPause;
FXCODEC_STATUS m_ProssiveStatus;
CJBig2_Image** m_pImage;
@@ -114,7 +114,7 @@ public:
FX_BOOL MMR;
FX_DWORD GBW;
FX_DWORD GBH;
- FX_BYTE GBTEMPLATE;
+ uint8_t GBTEMPLATE;
FX_BOOL TPGDON;
FX_BOOL USESKIP;
CJBig2_Image * SKIP;
@@ -140,8 +140,8 @@ public:
FX_DWORD GRH;
FX_BOOL GRTEMPLATE;
CJBig2_Image *GRREFERENCE;
- FX_INT32 GRREFERENCEDX;
- FX_INT32 GRREFERENCEDY;
+ int32_t GRREFERENCEDX;
+ int32_t GRREFERENCEDY;
FX_BOOL TPGRON;
signed char GRAT[4];
};
@@ -175,7 +175,7 @@ public:
FX_DWORD SBNUMSYMS;
JBig2HuffmanCode *SBSYMCODES;
- FX_BYTE SBSYMCODELEN;
+ uint8_t SBSYMCODELEN;
CJBig2_Image **SBSYMS;
FX_BOOL SBDEFPIXEL;
@@ -214,7 +214,7 @@ public:
*SDHUFFDW,
*SDHUFFBMSIZE,
*SDHUFFAGGINST;
- FX_BYTE SDTEMPLATE;
+ uint8_t SDTEMPLATE;
signed char SDAT[8];
FX_BOOL SDRTEMPLATE;
signed char SDRAT[4];
@@ -230,7 +230,7 @@ public:
FX_DWORD HBW,
HBH;
FX_BOOL HMMR;
- FX_BYTE HTEMPLATE;
+ uint8_t HTEMPLATE;
FX_DWORD HNUMPATS;
CJBig2_Image **HPATS;
FX_BOOL HDEFPIXEL;
@@ -238,11 +238,11 @@ public:
FX_BOOL HENABLESKIP;
FX_DWORD HGW,
HGH;
- FX_INT32 HGX,
+ int32_t HGX,
HGY;
FX_WORD HRX,
HRY;
- FX_BYTE HPW,
+ uint8_t HPW,
HPH;
};
class CJBig2_PDDProc : public CJBig2_Object
@@ -254,10 +254,10 @@ public:
CJBig2_PatternDict *decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause);
public:
FX_BOOL HDMMR;
- FX_BYTE HDPW,
+ uint8_t HDPW,
HDPH;
FX_DWORD GRAYMAX;
- FX_BYTE HDTEMPLATE;
+ uint8_t HDTEMPLATE;
};
class CJBig2_GSIDProc : public CJBig2_Object
{
@@ -269,10 +269,10 @@ public:
public:
FX_BOOL GSMMR;
FX_BOOL GSUSESKIP;
- FX_BYTE GSBPP;
+ uint8_t GSBPP;
FX_DWORD GSW,
GSH;
- FX_BYTE GSTEMPLATE;
+ uint8_t GSTEMPLATE;
CJBig2_Image *GSKIP;
};
#endif
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/src/fxcodec/jbig2/JBig2_Image.cpp
index f2cea597c1..044ccf7410 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Image.cpp
@@ -11,7 +11,7 @@
#include "../../../include/fxcrt/fx_safe_types.h"
#include "JBig2_Image.h"
-CJBig2_Image::CJBig2_Image(FX_INT32 w, FX_INT32 h)
+CJBig2_Image::CJBig2_Image(int32_t w, int32_t h)
{
m_nWidth = w;
m_nHeight = h;
@@ -22,13 +22,13 @@ CJBig2_Image::CJBig2_Image(FX_INT32 w, FX_INT32 h)
}
m_nStride = ((w + 31) >> 5) << 2;
if (m_nStride * m_nHeight > 0 && 104857600 / (int)m_nStride > m_nHeight) {
- m_pData = (FX_BYTE *)m_pModule->JBig2_Malloc2(m_nStride, m_nHeight);
+ m_pData = (uint8_t *)m_pModule->JBig2_Malloc2(m_nStride, m_nHeight);
} else {
m_pData = NULL;
}
m_bNeedFree = TRUE;
}
-CJBig2_Image::CJBig2_Image(FX_INT32 w, FX_INT32 h, FX_INT32 stride, FX_BYTE*pBuf)
+CJBig2_Image::CJBig2_Image(int32_t w, int32_t h, int32_t stride, uint8_t*pBuf)
{
m_nWidth = w;
m_nHeight = h;
@@ -43,7 +43,7 @@ CJBig2_Image::CJBig2_Image(CJBig2_Image &im)
m_nHeight = im.m_nHeight;
m_nStride = im.m_nStride;
if (im.m_pData) {
- m_pData = (FX_BYTE*)m_pModule->JBig2_Malloc2(m_nStride, m_nHeight);
+ m_pData = (uint8_t*)m_pModule->JBig2_Malloc2(m_nStride, m_nHeight);
JBIG2_memcpy(m_pData, im.m_pData, m_nStride * m_nHeight);
} else {
m_pData = NULL;
@@ -56,12 +56,12 @@ CJBig2_Image::~CJBig2_Image()
m_pModule->JBig2_Free(m_pData);
}
}
-FX_BOOL CJBig2_Image::getPixel(FX_INT32 x, FX_INT32 y)
+FX_BOOL CJBig2_Image::getPixel(int32_t x, int32_t y)
{
if (!m_pData) {
return 0;
}
- FX_INT32 m, n;
+ int32_t m, n;
if(x < 0 || x >= m_nWidth) {
return 0;
}
@@ -73,12 +73,12 @@ FX_BOOL CJBig2_Image::getPixel(FX_INT32 x, FX_INT32 y)
return ((m_pData[m] >> (7 - n)) & 1);
}
-FX_INT32 CJBig2_Image::setPixel(FX_INT32 x, FX_INT32 y, FX_BOOL v)
+int32_t CJBig2_Image::setPixel(int32_t x, int32_t y, FX_BOOL v)
{
if (!m_pData) {
return 0;
}
- FX_INT32 m, n;
+ int32_t m, n;
if(x < 0 || x >= m_nWidth) {
return 0;
}
@@ -94,7 +94,7 @@ FX_INT32 CJBig2_Image::setPixel(FX_INT32 x, FX_INT32 y, FX_BOOL v)
}
return 1;
}
-void CJBig2_Image::copyLine(FX_INT32 hTo, FX_INT32 hFrom)
+void CJBig2_Image::copyLine(int32_t hTo, int32_t hFrom)
{
if (!m_pData) {
return;
@@ -112,14 +112,14 @@ void CJBig2_Image::fill(FX_BOOL v)
}
JBIG2_memset(m_pData, v ? 0xff : 0, m_nStride * m_nHeight);
}
-FX_BOOL CJBig2_Image::composeTo(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op)
+FX_BOOL CJBig2_Image::composeTo(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op)
{
if (!m_pData) {
return FALSE;
}
return composeTo_opt2(pDst, x, y, op);
}
-FX_BOOL CJBig2_Image::composeTo(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op, const FX_RECT* pSrcRect)
+FX_BOOL CJBig2_Image::composeTo(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op, const FX_RECT* pSrcRect)
{
if (!m_pData) {
return FALSE;
@@ -129,10 +129,10 @@ FX_BOOL CJBig2_Image::composeTo(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig
}
return composeTo_opt2(pDst, x, y, op, pSrcRect);
}
-FX_BOOL CJBig2_Image::composeTo_unopt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op)
+FX_BOOL CJBig2_Image::composeTo_unopt(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op)
{
- FX_INT32 w, h, dx, dy;
- FX_INT32 i, j;
+ int32_t w, h, dx, dy;
+ int32_t i, j;
w = m_nWidth;
h = m_nHeight;
dx = dy = 0;
@@ -196,10 +196,10 @@ FX_BOOL CJBig2_Image::composeTo_unopt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y
return TRUE;
}
-FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op)
+FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op)
{
- FX_INT32 x0, x1, y0, y1, xx, yy;
- FX_BYTE *pLineSrc, *pLineDst, *srcPtr, *destPtr;
+ int32_t x0, x1, y0, y1, xx, yy;
+ uint8_t *pLineSrc, *pLineDst, *srcPtr, *destPtr;
FX_DWORD src0, src1, src, dest, s1, s2, m1, m2, m3;
FX_BOOL oneByte;
if (!m_pData) {
@@ -247,7 +247,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc;
dest = *destPtr;
dest |= (*srcPtr >> s1) & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -259,7 +259,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc;
dest = *destPtr;
dest &= ((0xff00 | *srcPtr) >> s1) | m1;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -271,7 +271,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc;
dest = *destPtr;
dest ^= (*srcPtr >> s1) & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -283,7 +283,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc;
dest = *destPtr;
dest ^= ((*srcPtr ^ 0xff) >> s1) & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -295,7 +295,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc;
dest = *destPtr;
dest = (dest & ~m3) | ((*srcPtr >> s1) & m3);
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -310,7 +310,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc + (-x >> 3);
dest = *destPtr;
dest |= *srcPtr & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -322,7 +322,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc + (-x >> 3);
dest = *destPtr;
dest &= *srcPtr | m1;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -334,7 +334,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc + (-x >> 3);
dest = *destPtr;
dest ^= *srcPtr & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -346,7 +346,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc + (-x >> 3);
dest = *destPtr;
dest ^= (*srcPtr ^ 0xff) & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -358,7 +358,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
srcPtr = pLineSrc + (-x >> 3);
dest = *destPtr;
dest = (*srcPtr & m2) | (dest & m1);
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -376,7 +376,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
dest = *destPtr;
dest |= src1 >> s1;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
xx = x0 + 8;
for (; xx < x1 - 8; xx += 8) {
dest = *destPtr;
@@ -384,7 +384,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest |= src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -395,7 +395,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest |= src & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -408,7 +408,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
dest = *destPtr;
dest &= (0xff00 | src1) >> s1;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
xx = x0 + 8;
for (; xx < x1 - 8; xx += 8) {
dest = *destPtr;
@@ -416,7 +416,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest &= src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -427,7 +427,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest &= src | m1;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -440,7 +440,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
dest = *destPtr;
dest ^= src1 >> s1;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
xx = x0 + 8;
for (; xx < x1 - 8; xx += 8) {
dest = *destPtr;
@@ -448,7 +448,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -459,7 +459,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= src & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -472,7 +472,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
dest = *destPtr;
dest ^= (src1 ^ 0xff) >> s1;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
xx = x0 + 8;
for (; xx < x1 - 8; xx += 8) {
dest = *destPtr;
@@ -480,7 +480,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= src ^ 0xff;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -491,7 +491,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= (src ^ 0xff) & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -504,7 +504,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
dest = *destPtr;
dest = (dest & (0xff << s2)) | (src1 >> s1);
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
xx = x0 + 8;
for (; xx < x1 - 8; xx += 8) {
dest = *destPtr;
@@ -512,7 +512,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest = src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -523,7 +523,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest = (src & m2) | (dest & m1);
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -544,7 +544,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest |= src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -555,7 +555,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest |= src & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -573,7 +573,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest &= src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -584,7 +584,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest &= src | m1;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -602,7 +602,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -613,7 +613,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= src & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -631,7 +631,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= src ^ 0xff;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -642,7 +642,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest ^= (src ^ 0xff) & m2;
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -660,7 +660,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
src1 = *srcPtr++;
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest = src;
- *destPtr++ = (FX_BYTE)dest;
+ *destPtr++ = (uint8_t)dest;
}
dest = *destPtr;
src0 = src1;
@@ -671,7 +671,7 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
src = (((src0 << 8) | src1) >> s1) & 0xff;
dest = (src & m2) | (dest & m1);
- *destPtr = (FX_BYTE)dest;
+ *destPtr = (uint8_t)dest;
pLineDst += pDst->m_nStride;
pLineSrc += m_nStride;
}
@@ -682,24 +682,24 @@ FX_BOOL CJBig2_Image::composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
return TRUE;
}
-FX_BOOL CJBig2_Image::composeFrom(FX_INT32 x, FX_INT32 y, CJBig2_Image *pSrc, JBig2ComposeOp op)
+FX_BOOL CJBig2_Image::composeFrom(int32_t x, int32_t y, CJBig2_Image *pSrc, JBig2ComposeOp op)
{
if (!m_pData) {
return FALSE;
}
return pSrc->composeTo(this, x, y, op);
}
-FX_BOOL CJBig2_Image::composeFrom(FX_INT32 x, FX_INT32 y, CJBig2_Image *pSrc, JBig2ComposeOp op, const FX_RECT* pSrcRect)
+FX_BOOL CJBig2_Image::composeFrom(int32_t x, int32_t y, CJBig2_Image *pSrc, JBig2ComposeOp op, const FX_RECT* pSrcRect)
{
if (!m_pData) {
return FALSE;
}
return pSrc->composeTo(this, x, y, op, pSrcRect);
}
-CJBig2_Image *CJBig2_Image::subImage_unopt(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT32 h)
+CJBig2_Image *CJBig2_Image::subImage_unopt(int32_t x, int32_t y, int32_t w, int32_t h)
{
CJBig2_Image *pImage;
- FX_INT32 i, j;
+ int32_t i, j;
JBIG2_ALLOC(pImage, CJBig2_Image(w, h));
for(j = 0; j < h; j++) {
for(i = 0; i < w; i++) {
@@ -709,13 +709,13 @@ CJBig2_Image *CJBig2_Image::subImage_unopt(FX_INT32 x, FX_INT32 y, FX_INT32 w, F
return pImage;
}
#define JBIG2_GETDWORD(buf) ((FX_DWORD)(((buf)[0] << 24) | ((buf)[1] << 16) | ((buf)[2] << 8) | (buf)[3]))
-CJBig2_Image *CJBig2_Image::subImage(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT32 h)
+CJBig2_Image *CJBig2_Image::subImage(int32_t x, int32_t y, int32_t w, int32_t h)
{
CJBig2_Image *pImage;
- FX_INT32 m, n, j;
- FX_BYTE *pLineSrc, *pLineDst;
+ int32_t m, n, j;
+ uint8_t *pLineSrc, *pLineDst;
FX_DWORD wTmp;
- FX_BYTE *pSrc, *pSrcEnd, *pDst, *pDstEnd;
+ uint8_t *pSrc, *pSrcEnd, *pDst, *pDstEnd;
if (w == 0 || h == 0) {
return NULL;
}
@@ -755,10 +755,10 @@ CJBig2_Image *CJBig2_Image::subImage(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT3
} else {
wTmp = JBIG2_GETDWORD(pSrc) << n;
}
- pDst[0] = (FX_BYTE)(wTmp >> 24);
- pDst[1] = (FX_BYTE)(wTmp >> 16);
- pDst[2] = (FX_BYTE)(wTmp >> 8);
- pDst[3] = (FX_BYTE)wTmp;
+ pDst[0] = (uint8_t)(wTmp >> 24);
+ pDst[1] = (uint8_t)(wTmp >> 16);
+ pDst[2] = (uint8_t)(wTmp >> 8);
+ pDst[3] = (uint8_t)wTmp;
}
pLineSrc += m_nStride;
pLineDst += pImage->m_nStride;
@@ -766,7 +766,7 @@ CJBig2_Image *CJBig2_Image::subImage(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT3
}
return pImage;
}
-void CJBig2_Image::expand(FX_INT32 h, FX_BOOL v)
+void CJBig2_Image::expand(int32_t h, FX_BOOL v)
{
if (!m_pData || h <= m_nHeight) {
return;
@@ -780,7 +780,7 @@ void CJBig2_Image::expand(FX_INT32 h, FX_BOOL v)
return;
}
//The guaranteed reallocated memory is to be < 4GB (unsigned int).
- m_pData = (FX_BYTE*)m_pModule->JBig2_Realloc(m_pData, safeMemSize.ValueOrDie());
+ m_pData = (uint8_t*)m_pModule->JBig2_Realloc(m_pData, safeMemSize.ValueOrDie());
//The result of dwHeight * dwStride doesn't overflow after the
//checking of safeMemSize.
//The same as the result of (dwH - dwHeight) * dwStride) because
@@ -789,15 +789,15 @@ void CJBig2_Image::expand(FX_INT32 h, FX_BOOL v)
JBIG2_memset(m_pData + dwHeight * dwStride, v ? 0xff : 0, (dwH - dwHeight) * dwStride);
m_nHeight = h;
}
-FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op)
+FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op)
{
- FX_INT32 xs0 = 0, ys0 = 0, xs1 = 0, ys1 = 0, xd0 = 0, yd0 = 0, xd1 = 0,
+ int32_t xs0 = 0, ys0 = 0, xs1 = 0, ys1 = 0, xd0 = 0, yd0 = 0, xd1 = 0,
yd1 = 0, xx = 0, yy = 0, w = 0, h = 0, middleDwords = 0, lineLeft = 0;
FX_DWORD s1 = 0, d1 = 0, d2 = 0, shift = 0, shift1 = 0, shift2 = 0,
tmp = 0, tmp1 = 0, tmp2 = 0, maskL = 0, maskR = 0, maskM = 0;
- FX_BYTE *lineSrc = NULL, *lineDst = NULL, *sp = NULL, *dp = NULL;
+ uint8_t *lineSrc = NULL, *lineDst = NULL, *sp = NULL, *dp = NULL;
if (!m_pData) {
return FALSE;
@@ -867,10 +867,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskM) | (tmp1 & maskM);
break;
}
- lineDst[0] = (FX_BYTE)(tmp >> 24);
- lineDst[1] = (FX_BYTE)(tmp >> 16);
- lineDst[2] = (FX_BYTE)(tmp >> 8);
- lineDst[3] = (FX_BYTE)tmp;
+ lineDst[0] = (uint8_t)(tmp >> 24);
+ lineDst[1] = (uint8_t)(tmp >> 16);
+ lineDst[2] = (uint8_t)(tmp >> 8);
+ lineDst[3] = (uint8_t)tmp;
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
}
@@ -896,10 +896,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskM) | (tmp1 & maskM);
break;
}
- lineDst[0] = (FX_BYTE)(tmp >> 24);
- lineDst[1] = (FX_BYTE)(tmp >> 16);
- lineDst[2] = (FX_BYTE)(tmp >> 8);
- lineDst[3] = (FX_BYTE)tmp;
+ lineDst[0] = (uint8_t)(tmp >> 24);
+ lineDst[1] = (uint8_t)(tmp >> 16);
+ lineDst[2] = (uint8_t)(tmp >> 8);
+ lineDst[3] = (uint8_t)tmp;
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
}
@@ -927,10 +927,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskM) | (tmp1 & maskM);
break;
}
- lineDst[0] = (FX_BYTE)(tmp >> 24);
- lineDst[1] = (FX_BYTE)(tmp >> 16);
- lineDst[2] = (FX_BYTE)(tmp >> 8);
- lineDst[3] = (FX_BYTE)tmp;
+ lineDst[0] = (uint8_t)(tmp >> 24);
+ lineDst[1] = (uint8_t)(tmp >> 16);
+ lineDst[2] = (uint8_t)(tmp >> 8);
+ lineDst[3] = (uint8_t)tmp;
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
}
@@ -963,10 +963,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskL) | (tmp1 & maskL);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -990,10 +990,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = tmp1;
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1018,10 +1018,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskR) | (tmp1 & maskR);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
}
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
@@ -1051,10 +1051,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskL) | (tmp1 & maskL);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1078,10 +1078,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = tmp1;
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1105,10 +1105,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskR) | (tmp1 & maskR);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
}
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
@@ -1140,10 +1140,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskL) | (tmp1 & maskL);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
dp += 4;
}
for(xx = 0; xx < middleDwords; xx++) {
@@ -1166,10 +1166,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = tmp1;
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1194,10 +1194,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskR) | (tmp1 & maskR);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
}
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
@@ -1206,12 +1206,12 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
}
return 1;
}
-FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op, const FX_RECT* pSrcRect)
+FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op, const FX_RECT* pSrcRect)
{
- FX_INT32 xs0, ys0, xs1, ys1, xd0, yd0, xd1, yd1, xx, yy, w, h, middleDwords, lineLeft;
+ int32_t xs0, ys0, xs1, ys1, xd0, yd0, xd1, yd1, xx, yy, w, h, middleDwords, lineLeft;
FX_DWORD s1, d1, d2, shift, shift1, shift2, tmp, tmp1, tmp2, maskL, maskR, maskM;
- FX_BYTE *lineSrc, *lineDst, *sp, *dp;
- FX_INT32 sw, sh;
+ uint8_t *lineSrc, *lineDst, *sp, *dp;
+ int32_t sw, sh;
if (!m_pData) {
return FALSE;
}
@@ -1290,10 +1290,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskM) | (tmp1 & maskM);
break;
}
- lineDst[0] = (FX_BYTE)(tmp >> 24);
- lineDst[1] = (FX_BYTE)(tmp >> 16);
- lineDst[2] = (FX_BYTE)(tmp >> 8);
- lineDst[3] = (FX_BYTE)tmp;
+ lineDst[0] = (uint8_t)(tmp >> 24);
+ lineDst[1] = (uint8_t)(tmp >> 16);
+ lineDst[2] = (uint8_t)(tmp >> 8);
+ lineDst[3] = (uint8_t)tmp;
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
}
@@ -1319,10 +1319,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskM) | (tmp1 & maskM);
break;
}
- lineDst[0] = (FX_BYTE)(tmp >> 24);
- lineDst[1] = (FX_BYTE)(tmp >> 16);
- lineDst[2] = (FX_BYTE)(tmp >> 8);
- lineDst[3] = (FX_BYTE)tmp;
+ lineDst[0] = (uint8_t)(tmp >> 24);
+ lineDst[1] = (uint8_t)(tmp >> 16);
+ lineDst[2] = (uint8_t)(tmp >> 8);
+ lineDst[3] = (uint8_t)tmp;
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
}
@@ -1350,10 +1350,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskM) | (tmp1 & maskM);
break;
}
- lineDst[0] = (FX_BYTE)(tmp >> 24);
- lineDst[1] = (FX_BYTE)(tmp >> 16);
- lineDst[2] = (FX_BYTE)(tmp >> 8);
- lineDst[3] = (FX_BYTE)tmp;
+ lineDst[0] = (uint8_t)(tmp >> 24);
+ lineDst[1] = (uint8_t)(tmp >> 16);
+ lineDst[2] = (uint8_t)(tmp >> 8);
+ lineDst[3] = (uint8_t)tmp;
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
}
@@ -1386,10 +1386,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskL) | (tmp1 & maskL);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1413,10 +1413,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = tmp1;
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1441,10 +1441,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskR) | (tmp1 & maskR);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
}
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
@@ -1474,10 +1474,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskL) | (tmp1 & maskL);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1501,10 +1501,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = tmp1;
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1528,10 +1528,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskR) | (tmp1 & maskR);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
}
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
@@ -1563,10 +1563,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskL) | (tmp1 & maskL);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
dp += 4;
}
for(xx = 0; xx < middleDwords; xx++) {
@@ -1589,10 +1589,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = tmp1;
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
sp += 4;
dp += 4;
}
@@ -1617,10 +1617,10 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y,
tmp = (tmp2 & ~maskR) | (tmp1 & maskR);
break;
}
- dp[0] = (FX_BYTE)(tmp >> 24);
- dp[1] = (FX_BYTE)(tmp >> 16);
- dp[2] = (FX_BYTE)(tmp >> 8);
- dp[3] = (FX_BYTE)tmp;
+ dp[0] = (uint8_t)(tmp >> 24);
+ dp[1] = (uint8_t)(tmp >> 16);
+ dp[2] = (uint8_t)(tmp >> 8);
+ dp[3] = (uint8_t)tmp;
}
lineSrc += m_nStride;
lineDst += pDst->m_nStride;
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.h b/core/src/fxcodec/jbig2/JBig2_Image.h
index 5d06695c7c..423bebcede 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.h
+++ b/core/src/fxcodec/jbig2/JBig2_Image.h
@@ -20,48 +20,48 @@ class CJBig2_Image : public CJBig2_Object
{
public:
- CJBig2_Image(FX_INT32 w, FX_INT32 h);
+ CJBig2_Image(int32_t w, int32_t h);
- CJBig2_Image(FX_INT32 w, FX_INT32 h, FX_INT32 stride, FX_BYTE*pBuf);
+ CJBig2_Image(int32_t w, int32_t h, int32_t stride, uint8_t*pBuf);
CJBig2_Image(CJBig2_Image &im);
~CJBig2_Image();
- FX_BOOL getPixel(FX_INT32 x, FX_INT32 y);
+ FX_BOOL getPixel(int32_t x, int32_t y);
- FX_INT32 setPixel(FX_INT32 x, FX_INT32 y, FX_BOOL v);
+ int32_t setPixel(int32_t x, int32_t y, FX_BOOL v);
- void copyLine(FX_INT32 hTo, FX_INT32 hFrom);
+ void copyLine(int32_t hTo, int32_t hFrom);
void fill(FX_BOOL v);
- FX_BOOL composeTo(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
- FX_BOOL composeTo(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
+ FX_BOOL composeTo(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
+ FX_BOOL composeTo(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
- FX_BOOL composeTo_unopt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
+ FX_BOOL composeTo_unopt(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
- FX_BOOL composeTo_opt(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
+ FX_BOOL composeTo_opt(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
- FX_BOOL composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op);
- FX_BOOL composeTo_opt2(CJBig2_Image *pDst, FX_INT32 x, FX_INT32 y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
+ FX_BOOL composeTo_opt2(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op);
+ FX_BOOL composeTo_opt2(CJBig2_Image *pDst, int32_t x, int32_t y, JBig2ComposeOp op, const FX_RECT* pSrcRect);
- FX_BOOL composeFrom(FX_INT32 x, FX_INT32 y, CJBig2_Image *pSrc, JBig2ComposeOp op);
- FX_BOOL composeFrom(FX_INT32 x, FX_INT32 y, CJBig2_Image *pSrc, JBig2ComposeOp op, const FX_RECT* pSrcRect);
- CJBig2_Image *subImage_unopt(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT32 h);
+ FX_BOOL composeFrom(int32_t x, int32_t y, CJBig2_Image *pSrc, JBig2ComposeOp op);
+ FX_BOOL composeFrom(int32_t x, int32_t y, CJBig2_Image *pSrc, JBig2ComposeOp op, const FX_RECT* pSrcRect);
+ CJBig2_Image *subImage_unopt(int32_t x, int32_t y, int32_t w, int32_t h);
- CJBig2_Image *subImage(FX_INT32 x, FX_INT32 y, FX_INT32 w, FX_INT32 h);
+ CJBig2_Image *subImage(int32_t x, int32_t y, int32_t w, int32_t h);
- void expand(FX_INT32 h, FX_BOOL v);
+ void expand(int32_t h, FX_BOOL v);
public:
- FX_INT32 m_nWidth;
+ int32_t m_nWidth;
- FX_INT32 m_nHeight;
+ int32_t m_nHeight;
- FX_INT32 m_nStride;
+ int32_t m_nStride;
- FX_BYTE *m_pData;
+ uint8_t *m_pData;
FX_BOOL m_bNeedFree;
};
diff --git a/core/src/fxcodec/jbig2/JBig2_List.h b/core/src/fxcodec/jbig2/JBig2_List.h
index 9292724b1e..19f99dec3d 100644
--- a/core/src/fxcodec/jbig2/JBig2_List.h
+++ b/core/src/fxcodec/jbig2/JBig2_List.h
@@ -13,7 +13,7 @@ class CJBig2_List : public CJBig2_Object
{
public:
- CJBig2_List(FX_INT32 nSize = 8)
+ CJBig2_List(int32_t nSize = 8)
{
m_nSize = nSize;
m_pArray = (TYPE**)m_pModule->JBig2_Malloc2(sizeof(TYPE*), nSize);
@@ -28,7 +28,7 @@ public:
void clear()
{
- FX_INT32 i;
+ int32_t i;
for(i = 0; i < m_nLength; i++) {
delete m_pArray[i];
}
@@ -45,12 +45,12 @@ public:
}
- FX_INT32 getLength()
+ int32_t getLength()
{
return m_nLength;
}
- TYPE *getAt(FX_INT32 nIndex)
+ TYPE *getAt(int32_t nIndex)
{
return m_pArray[nIndex];
}
@@ -60,8 +60,8 @@ public:
return m_pArray[m_nLength - 1];
}
private:
- FX_INT32 m_nSize;
+ int32_t m_nSize;
TYPE **m_pArray;
- FX_INT32 m_nLength;
+ int32_t m_nLength;
};
#endif
diff --git a/core/src/fxcodec/jbig2/JBig2_Module.h b/core/src/fxcodec/jbig2/JBig2_Module.h
index 711cf4047b..aef31bb49f 100644
--- a/core/src/fxcodec/jbig2/JBig2_Module.h
+++ b/core/src/fxcodec/jbig2/JBig2_Module.h
@@ -22,7 +22,7 @@ public:
virtual void JBig2_Free(FX_LPVOID pMem) = 0;
- virtual void JBig2_Assert(FX_INT32 nExpression) {};
+ virtual void JBig2_Assert(int32_t nExpression) {};
virtual void JBig2_Error(FX_LPCSTR format, ...) {};
diff --git a/core/src/fxcodec/jbig2/JBig2_Object.cpp b/core/src/fxcodec/jbig2/JBig2_Object.cpp
index 2bb267b085..4bb00b897b 100644
--- a/core/src/fxcodec/jbig2/JBig2_Object.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Object.cpp
@@ -36,9 +36,9 @@ void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t
FX_LPCSTR filename, int line)
{
void *p;
- FX_BYTE *pCur, *pEnd;
- p = (FX_BYTE *)pModule->JBig2_Malloc((FX_DWORD)size);
- pCur = (FX_BYTE *)p;
+ uint8_t *pCur, *pEnd;
+ p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size);
+ pCur = (uint8_t *)p;
pEnd = pCur + size;
for(; pCur < pEnd; pCur += unit_size) {
((CJBig2_Object *)pCur)->m_pModule = pModule;
@@ -53,9 +53,9 @@ void CJBig2_Object::operator delete[](void *p, CJBig2_Module *pModule, size_t un
void *CJBig2_Object::operator new[](size_t size, CJBig2_Module *pModule, size_t unit_size)
{
void *p;
- FX_BYTE *pCur, *pEnd;
- p = (FX_BYTE *)pModule->JBig2_Malloc((FX_DWORD)size);
- pCur = (FX_BYTE *)p;
+ uint8_t *pCur, *pEnd;
+ p = (uint8_t *)pModule->JBig2_Malloc((FX_DWORD)size);
+ pCur = (uint8_t *)p;
pEnd = pCur + size;
for(; pCur < pEnd; pCur += unit_size) {
((CJBig2_Object *)pCur)->m_pModule = pModule;
diff --git a/core/src/fxcodec/jbig2/JBig2_Page.h b/core/src/fxcodec/jbig2/JBig2_Page.h
index d7399bd452..b07eba8a3a 100644
--- a/core/src/fxcodec/jbig2/JBig2_Page.h
+++ b/core/src/fxcodec/jbig2/JBig2_Page.h
@@ -12,7 +12,7 @@ struct JBig2PageInfo : public CJBig2_Object {
m_dwHeight;
FX_DWORD m_dwResolutionX,
m_dwResolutionY;
- FX_BYTE m_cFlags;
+ uint8_t m_cFlags;
FX_BOOL m_bIsStriped;
FX_WORD m_wMaxStripeSize;
};
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.h b/core/src/fxcodec/jbig2/JBig2_Segment.h
index 33ee721a1b..fe44bc962d 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.h
+++ b/core/src/fxcodec/jbig2/JBig2_Segment.h
@@ -42,19 +42,19 @@ public:
FX_DWORD m_dwNumber;
union {
struct {
- FX_BYTE type : 6;
- FX_BYTE page_association_size : 1;
- FX_BYTE deferred_non_retain : 1;
+ uint8_t type : 6;
+ uint8_t page_association_size : 1;
+ uint8_t deferred_non_retain : 1;
} s;
- FX_BYTE c;
+ uint8_t c;
} m_cFlags;
- FX_INT32 m_nReferred_to_segment_count;
+ int32_t m_nReferred_to_segment_count;
FX_DWORD * m_pReferred_to_segment_numbers;
FX_DWORD m_dwPage_association;
FX_DWORD m_dwData_length;
FX_DWORD m_dwHeader_Length;
- FX_BYTE *m_pData;
+ uint8_t *m_pData;
JBig2_SegmentState m_State;
JBig2_ResultType m_nResultType;
union {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:16:00 +0000