diff options
Diffstat (limited to 'core/src/fxcodec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 3 | ||||
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp | 5 | ||||
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp | 36 |
3 files changed, 21 insertions, 23 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 17e2bcf356..db0c2eae4b 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -676,8 +676,7 @@ void* CCodec_JpegModule::Start() { if (m_pExtProvider) { return m_pExtProvider->Start(); } - FXJPEG_Context* p = - (FXJPEG_Context*)FX_Alloc(uint8_t, sizeof(FXJPEG_Context)); + FXJPEG_Context* p = FX_Alloc(FXJPEG_Context, 1); p->m_AllocFunc = jpeg_alloc_func; p->m_FreeFunc = jpeg_free_func; p->m_ErrMgr.error_exit = _error_fatal1; diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp index d12ab5a2e8..c8baa158e9 100644 --- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp +++ b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp @@ -9,7 +9,7 @@ #include "../../../include/fxcrt/fx_memory.h" CJBig2_ArithIntDecoder::CJBig2_ArithIntDecoder() { - IAx = (JBig2ArithCtx*)FX_AllocOrDie(sizeof(JBig2ArithCtx), 512); + IAx = FX_Alloc(JBig2ArithCtx, 512); JBIG2_memset(IAx, 0, sizeof(JBig2ArithCtx) * 512); } CJBig2_ArithIntDecoder::~CJBig2_ArithIntDecoder() { @@ -82,8 +82,7 @@ int CJBig2_ArithIntDecoder::decode(CJBig2_ArithDecoder* pArithDecoder, } CJBig2_ArithIaidDecoder::CJBig2_ArithIaidDecoder(unsigned char SBSYMCODELENA) { SBSYMCODELEN = SBSYMCODELENA; - IAID = - (JBig2ArithCtx*)FX_AllocOrDie(sizeof(JBig2ArithCtx), (1 << SBSYMCODELEN)); + IAID = FX_Alloc(JBig2ArithCtx, 1 << SBSYMCODELEN); JBIG2_memset(IAID, 0, sizeof(JBig2ArithCtx) * (int)(1 << SBSYMCODELEN)); } CJBig2_ArithIaidDecoder::~CJBig2_ArithIaidDecoder() { diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp b/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp index ea1fdee3be..704145806a 100644 --- a/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp +++ b/core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp @@ -45,10 +45,10 @@ int CJBig2_HuffmanTable::parseFromStandardTable(const JBig2TableLine* pTable, int* FIRSTCODE; HTOOB = bHTOOB; NTEMP = nLines; - CODES = (int*)FX_AllocOrDie(sizeof(int), NTEMP); - PREFLEN = (int*)FX_AllocOrDie(sizeof(int), NTEMP); - RANGELEN = (int*)FX_AllocOrDie(sizeof(int), NTEMP); - RANGELOW = (int*)FX_AllocOrDie(sizeof(int), NTEMP); + CODES = FX_Alloc(int, NTEMP); + PREFLEN = FX_Alloc(int, NTEMP); + RANGELEN = FX_Alloc(int, NTEMP); + RANGELOW = FX_Alloc(int, NTEMP); LENMAX = 0; for (i = 0; i < NTEMP; i++) { PREFLEN[i] = pTable[i].PREFLEN; @@ -58,9 +58,9 @@ int CJBig2_HuffmanTable::parseFromStandardTable(const JBig2TableLine* pTable, LENMAX = PREFLEN[i]; } } - LENCOUNT = (int*)FX_AllocOrDie(sizeof(int), (LENMAX + 1)); + LENCOUNT = FX_Alloc(int, LENMAX + 1); JBIG2_memset(LENCOUNT, 0, sizeof(int) * (LENMAX + 1)); - FIRSTCODE = (int*)FX_AllocOrDie(sizeof(int), (LENMAX + 1)); + FIRSTCODE = FX_Alloc(int, LENMAX + 1); for (i = 0; i < NTEMP; i++) { LENCOUNT[PREFLEN[i]]++; } @@ -85,12 +85,12 @@ int CJBig2_HuffmanTable::parseFromStandardTable(const JBig2TableLine* pTable, return 1; } -#define HT_CHECK_MEMORY_ADJUST \ - if (NTEMP >= nSize) { \ - nSize += 16; \ - PREFLEN = (int*)FX_Realloc(uint8_t, PREFLEN, sizeof(int) * nSize); \ - RANGELEN = (int*)FX_Realloc(uint8_t, RANGELEN, sizeof(int) * nSize); \ - RANGELOW = (int*)FX_Realloc(uint8_t, RANGELOW, sizeof(int) * nSize); \ +#define HT_CHECK_MEMORY_ADJUST \ + if (NTEMP >= nSize) { \ + nSize += 16; \ + PREFLEN = FX_Realloc(int, PREFLEN, nSize); \ + RANGELEN = FX_Realloc(int, RANGELEN, nSize); \ + RANGELOW = FX_Realloc(int, RANGELOW, nSize); \ } int CJBig2_HuffmanTable::parseFromCodedBuffer(CJBig2_BitStream* pStream) { unsigned char HTPS, HTRS; @@ -111,9 +111,9 @@ int CJBig2_HuffmanTable::parseFromCodedBuffer(CJBig2_BitStream* pStream) { pStream->readInteger(&HTHIGH) == -1 || HTLOW > HTHIGH) { goto failed; } - PREFLEN = (int*)FX_AllocOrDie(sizeof(int), nSize); - RANGELEN = (int*)FX_AllocOrDie(sizeof(int), nSize); - RANGELOW = (int*)FX_AllocOrDie(sizeof(int), nSize); + PREFLEN = FX_Alloc(int, nSize); + RANGELEN = FX_Alloc(int, nSize); + RANGELOW = FX_Alloc(int, nSize); CURRANGELOW = HTLOW; NTEMP = 0; do { @@ -147,16 +147,16 @@ int CJBig2_HuffmanTable::parseFromCodedBuffer(CJBig2_BitStream* pStream) { } NTEMP = NTEMP + 1; } - CODES = (int*)FX_AllocOrDie(sizeof(int), NTEMP); + CODES = FX_Alloc(int, NTEMP); LENMAX = 0; for (int i = 0; i < NTEMP; i++) { if (PREFLEN[i] > LENMAX) { LENMAX = PREFLEN[i]; } } - LENCOUNT = (int*)FX_AllocOrDie(sizeof(int), (LENMAX + 1)); + LENCOUNT = FX_Alloc(int, (LENMAX + 1)); JBIG2_memset(LENCOUNT, 0, sizeof(int) * (LENMAX + 1)); - FIRSTCODE = (int*)FX_AllocOrDie(sizeof(int), (LENMAX + 1)); + FIRSTCODE = FX_Alloc(int, (LENMAX + 1)); for (int i = 0; i < NTEMP; i++) { LENCOUNT[PREFLEN[i]]++; } |