summaryrefslogtreecommitdiff
path: root/xfa/fgas/crt
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fgas/crt')
-rw-r--r--xfa/fgas/crt/fgas_algorithm.cpp8
-rw-r--r--xfa/fgas/crt/fgas_algorithm.h2
-rw-r--r--xfa/fgas/crt/fgas_codepage.cpp10
-rw-r--r--xfa/fgas/crt/fgas_encode.cpp12
-rw-r--r--xfa/fgas/crt/fgas_memory.cpp44
-rw-r--r--xfa/fgas/crt/fgas_stream.cpp110
-rw-r--r--xfa/fgas/crt/fgas_system.cpp8
-rw-r--r--xfa/fgas/crt/fgas_utils.cpp56
-rw-r--r--xfa/fgas/crt/fgas_utils.h14
9 files changed, 132 insertions, 132 deletions
diff --git a/xfa/fgas/crt/fgas_algorithm.cpp b/xfa/fgas/crt/fgas_algorithm.cpp
index ce8dda646a..ee557b10d9 100644
--- a/xfa/fgas/crt/fgas_algorithm.cpp
+++ b/xfa/fgas/crt/fgas_algorithm.cpp
@@ -55,7 +55,7 @@ static void FX_Base64EncodePiece(const FX_BASE64DATA& src,
}
}
int32_t FX_Base64EncodeA(const uint8_t* pSrc, int32_t iSrcLen, FX_CHAR* pDst) {
- FXSYS_assert(pSrc != NULL);
+ ASSERT(pSrc != NULL);
if (iSrcLen < 1) {
return 0;
}
@@ -118,7 +118,7 @@ static void FX_Base64DecodePiece(const FX_CHAR src[4],
int32_t iChars,
FX_BASE64DATA& dst,
int32_t& iBytes) {
- FXSYS_assert(iChars > 0 && iChars < 5);
+ ASSERT(iChars > 0 && iChars < 5);
iBytes = 1;
dst.data2 = g_FXBase64DecoderMap[(uint8_t)src[0]];
if (iChars > 1) {
@@ -144,7 +144,7 @@ static void FX_Base64DecodePiece(const FX_CHAR src[4],
}
}
int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst) {
- FXSYS_assert(pSrc != NULL);
+ ASSERT(pSrc != NULL);
if (iSrcLen < 1) {
return 0;
}
@@ -200,7 +200,7 @@ int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst) {
return pDstEnd - pDst;
}
int32_t FX_Base64DecodeW(const FX_WCHAR* pSrc, int32_t iSrcLen, uint8_t* pDst) {
- FXSYS_assert(pSrc != NULL);
+ ASSERT(pSrc != NULL);
if (iSrcLen < 1) {
return 0;
}
diff --git a/xfa/fgas/crt/fgas_algorithm.h b/xfa/fgas/crt/fgas_algorithm.h
index 94a0d06f9e..9fefb2bc40 100644
--- a/xfa/fgas/crt/fgas_algorithm.h
+++ b/xfa/fgas/crt/fgas_algorithm.h
@@ -31,7 +31,7 @@ template <class baseType>
class CFX_DSPATemplate {
public:
int32_t Lookup(const baseType& find, const baseType* pArray, int32_t iCount) {
- FXSYS_assert(pArray != NULL);
+ ASSERT(pArray != NULL);
if (iCount < 1) {
return -1;
}
diff --git a/xfa/fgas/crt/fgas_codepage.cpp b/xfa/fgas/crt/fgas_codepage.cpp
index 36c40a6469..7362a89d30 100644
--- a/xfa/fgas/crt/fgas_codepage.cpp
+++ b/xfa/fgas/crt/fgas_codepage.cpp
@@ -19,7 +19,7 @@ static const FX_CHARSET_MAP g_FXCharset2CodePageTable[] = {
};
uint16_t FX_GetCodePageFromCharset(uint8_t charset) {
int32_t iEnd = sizeof(g_FXCharset2CodePageTable) / sizeof(FX_CHARSET_MAP) - 1;
- FXSYS_assert(iEnd >= 0);
+ ASSERT(iEnd >= 0);
int32_t iStart = 0, iMid;
do {
iMid = (iStart + iEnd) / 2;
@@ -45,7 +45,7 @@ static const FX_CHARSET_MAP g_FXCodepage2CharsetTable[] = {
};
uint16_t FX_GetCharsetFromCodePage(uint16_t codepage) {
int32_t iEnd = sizeof(g_FXCodepage2CharsetTable) / sizeof(FX_CHARSET_MAP) - 1;
- FXSYS_assert(iEnd >= 0);
+ ASSERT(iEnd >= 0);
int32_t iStart = 0, iMid;
do {
iMid = (iStart + iEnd) / 2;
@@ -199,7 +199,7 @@ const FX_LANG2CPMAP g_FXLang2CodepageTable[] = {
};
uint16_t FX_GetDefCodePageByLanguage(uint16_t wLanguage) {
int32_t iEnd = sizeof(g_FXLang2CodepageTable) / sizeof(FX_LANG2CPMAP) - 1;
- FXSYS_assert(iEnd >= 0);
+ ASSERT(iEnd >= 0);
int32_t iStart = 0, iMid;
do {
iMid = (iStart + iEnd) / 2;
@@ -302,7 +302,7 @@ static const FX_STR2CPHASH g_FXCPHashTable[] = {
{0xf637e157, 0x478}, {0xfc213f3a, 0x2717}, {0xff654d14, 0x3b5},
};
uint16_t FX_GetCodePageFromStringA(const FX_CHAR* pStr, int32_t iLength) {
- FXSYS_assert(pStr != NULL);
+ ASSERT(pStr != NULL);
if (iLength < 0) {
iLength = FXSYS_strlen(pStr);
}
@@ -312,7 +312,7 @@ uint16_t FX_GetCodePageFromStringA(const FX_CHAR* pStr, int32_t iLength) {
uint32_t uHash = FX_HashCode_GetA(CFX_ByteStringC(pStr, iLength), true);
int32_t iStart = 0;
int32_t iEnd = sizeof(g_FXCPHashTable) / sizeof(FX_STR2CPHASH) - 1;
- FXSYS_assert(iEnd >= 0);
+ ASSERT(iEnd >= 0);
do {
int32_t iMid = (iStart + iEnd) / 2;
const FX_STR2CPHASH& cp = g_FXCPHashTable[iMid];
diff --git a/xfa/fgas/crt/fgas_encode.cpp b/xfa/fgas/crt/fgas_encode.cpp
index 84a1ef40ed..b84406f642 100644
--- a/xfa/fgas/crt/fgas_encode.cpp
+++ b/xfa/fgas/crt/fgas_encode.cpp
@@ -7,7 +7,7 @@
#include "xfa/fgas/crt/fgas_codepage.h"
void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) {
- FXSYS_assert(pStr != NULL);
+ ASSERT(pStr != NULL);
if (iLength < 0) {
iLength = FXSYS_wcslen(pStr);
}
@@ -30,7 +30,7 @@ void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) {
void FX_SwapByteOrderCopy(const FX_WCHAR* pSrc,
FX_WCHAR* pDst,
int32_t iLength) {
- FXSYS_assert(pSrc != NULL && pDst != NULL);
+ ASSERT(pSrc != NULL && pDst != NULL);
if (iLength < 0) {
iLength = FXSYS_wcslen(pSrc);
}
@@ -51,7 +51,7 @@ void FX_SwapByteOrderCopy(const FX_WCHAR* pSrc,
}
}
void FX_UTF16ToWChar(void* pBuffer, int32_t iLength) {
- FXSYS_assert(pBuffer != NULL && iLength > 0);
+ ASSERT(pBuffer != NULL && iLength > 0);
if (sizeof(FX_WCHAR) == 2) {
return;
}
@@ -64,7 +64,7 @@ void FX_UTF16ToWChar(void* pBuffer, int32_t iLength) {
void FX_UTF16ToWCharCopy(const uint16_t* pUTF16,
FX_WCHAR* pWChar,
int32_t iLength) {
- FXSYS_assert(pUTF16 != NULL && pWChar != NULL && iLength > 0);
+ ASSERT(pUTF16 != NULL && pWChar != NULL && iLength > 0);
if (sizeof(FX_WCHAR) == 2) {
FXSYS_memcpy(pWChar, pUTF16, iLength * sizeof(FX_WCHAR));
} else {
@@ -74,7 +74,7 @@ void FX_UTF16ToWCharCopy(const uint16_t* pUTF16,
}
}
void FX_WCharToUTF16(void* pBuffer, int32_t iLength) {
- FXSYS_assert(pBuffer != NULL && iLength > 0);
+ ASSERT(pBuffer != NULL && iLength > 0);
if (sizeof(FX_WCHAR) == 2) {
return;
}
@@ -87,7 +87,7 @@ void FX_WCharToUTF16(void* pBuffer, int32_t iLength) {
void FX_WCharToUTF16Copy(const FX_WCHAR* pWChar,
uint16_t* pUTF16,
int32_t iLength) {
- FXSYS_assert(pWChar != NULL && pUTF16 != NULL && iLength > 0);
+ ASSERT(pWChar != NULL && pUTF16 != NULL && iLength > 0);
if (sizeof(FX_WCHAR) == 2) {
FXSYS_memcpy(pUTF16, pWChar, iLength * sizeof(FX_WCHAR));
} else {
diff --git a/xfa/fgas/crt/fgas_memory.cpp b/xfa/fgas/crt/fgas_memory.cpp
index 7eda5b9ba6..4334789cb7 100644
--- a/xfa/fgas/crt/fgas_memory.cpp
+++ b/xfa/fgas/crt/fgas_memory.cpp
@@ -159,7 +159,7 @@ CFX_StaticStore::CFX_StaticStore(size_t iDefChunkSize)
m_iDefChunkSize(iDefChunkSize),
m_pChunk(NULL),
m_pLastChunk(NULL) {
- FXSYS_assert(m_iDefChunkSize != 0);
+ ASSERT(m_iDefChunkSize != 0);
}
CFX_StaticStore::~CFX_StaticStore() {
FX_STATICSTORECHUNK* pChunk = m_pChunk;
@@ -170,7 +170,7 @@ CFX_StaticStore::~CFX_StaticStore() {
}
}
FX_STATICSTORECHUNK* CFX_StaticStore::AllocChunk(size_t size) {
- FXSYS_assert(size != 0);
+ ASSERT(size != 0);
FX_STATICSTORECHUNK* pChunk = (FX_STATICSTORECHUNK*)FX_Alloc(
uint8_t, sizeof(FX_STATICSTORECHUNK) + size);
pChunk->iChunkSize = size;
@@ -185,7 +185,7 @@ FX_STATICSTORECHUNK* CFX_StaticStore::AllocChunk(size_t size) {
return pChunk;
}
FX_STATICSTORECHUNK* CFX_StaticStore::FindChunk(size_t size) {
- FXSYS_assert(size != 0);
+ ASSERT(size != 0);
if (m_pLastChunk == NULL || m_pLastChunk->iFreeSize < size) {
return AllocChunk(std::max(m_iDefChunkSize, size));
}
@@ -193,9 +193,9 @@ FX_STATICSTORECHUNK* CFX_StaticStore::FindChunk(size_t size) {
}
void* CFX_StaticStore::Alloc(size_t size) {
size = FX_4BYTEALIGN(size);
- FXSYS_assert(size != 0);
+ ASSERT(size != 0);
FX_STATICSTORECHUNK* pChunk = FindChunk(size);
- FXSYS_assert(pChunk->iFreeSize >= size);
+ ASSERT(pChunk->iFreeSize >= size);
uint8_t* p = (uint8_t*)pChunk;
p += sizeof(FX_STATICSTORECHUNK) + pChunk->iChunkSize - pChunk->iFreeSize;
pChunk->iFreeSize -= size;
@@ -203,7 +203,7 @@ void* CFX_StaticStore::Alloc(size_t size) {
return p;
}
size_t CFX_StaticStore::SetDefChunkSize(size_t size) {
- FXSYS_assert(size != 0);
+ ASSERT(size != 0);
size_t v = m_iDefChunkSize;
m_iDefChunkSize = size;
return v;
@@ -212,7 +212,7 @@ CFX_FixedStore::CFX_FixedStore(size_t iBlockSize, size_t iBlockNumsInChunk)
: m_iBlockSize(FX_4BYTEALIGN(iBlockSize)),
m_iDefChunkSize(FX_4BYTEALIGN(iBlockNumsInChunk)),
m_pChunk(NULL) {
- FXSYS_assert(m_iBlockSize != 0 && m_iDefChunkSize != 0);
+ ASSERT(m_iBlockSize != 0 && m_iDefChunkSize != 0);
}
CFX_FixedStore::~CFX_FixedStore() {
FX_FIXEDSTORECHUNK* pChunk = m_pChunk;
@@ -251,20 +251,20 @@ void* CFX_FixedStore::Alloc(size_t size) {
if (pChunk == NULL) {
pChunk = AllocChunk();
}
- FXSYS_assert(pChunk != NULL);
+ ASSERT(pChunk != NULL);
uint8_t* pFlags = pChunk->FirstFlag();
size_t i = 0;
for (; i < pChunk->iChunkSize; i++)
if (pFlags[i] == 0) {
break;
}
- FXSYS_assert(i < pChunk->iChunkSize);
+ ASSERT(i < pChunk->iChunkSize);
pFlags[i] = 1;
pChunk->iFreeNum--;
return pChunk->FirstBlock() + i * m_iBlockSize;
}
void CFX_FixedStore::Free(void* pBlock) {
- FXSYS_assert(pBlock != NULL);
+ ASSERT(pBlock != NULL);
FX_FIXEDSTORECHUNK* pPrior = NULL;
FX_FIXEDSTORECHUNK* pChunk = m_pChunk;
uint8_t* pStart = NULL;
@@ -279,9 +279,9 @@ void CFX_FixedStore::Free(void* pBlock) {
}
pPrior = pChunk, pChunk = pChunk->pNextChunk;
}
- FXSYS_assert(pChunk != NULL);
+ ASSERT(pChunk != NULL);
size_t iPos = ((uint8_t*)pBlock - pStart) / m_iBlockSize;
- FXSYS_assert(iPos < pChunk->iChunkSize);
+ ASSERT(iPos < pChunk->iChunkSize);
uint8_t* pFlags = pChunk->FirstFlag();
if (pFlags[iPos] == 0) {
return;
@@ -298,14 +298,14 @@ void CFX_FixedStore::Free(void* pBlock) {
}
}
size_t CFX_FixedStore::SetDefChunkSize(size_t iChunkSize) {
- FXSYS_assert(iChunkSize != 0);
+ ASSERT(iChunkSize != 0);
size_t v = m_iDefChunkSize;
m_iDefChunkSize = FX_4BYTEALIGN(iChunkSize);
return v;
}
CFX_DynamicStore::CFX_DynamicStore(size_t iDefChunkSize)
: m_iDefChunkSize(iDefChunkSize), m_pChunk(NULL) {
- FXSYS_assert(m_iDefChunkSize != 0);
+ ASSERT(m_iDefChunkSize != 0);
}
CFX_DynamicStore::~CFX_DynamicStore() {
FX_DYNAMICSTORECHUNK* pChunk = m_pChunk;
@@ -316,7 +316,7 @@ CFX_DynamicStore::~CFX_DynamicStore() {
}
}
FX_DYNAMICSTORECHUNK* CFX_DynamicStore::AllocChunk(size_t size) {
- FXSYS_assert(size != 0);
+ ASSERT(size != 0);
FX_DYNAMICSTORECHUNK* pChunk = (FX_DYNAMICSTORECHUNK*)FX_Alloc(
uint8_t,
sizeof(FX_DYNAMICSTORECHUNK) + sizeof(FX_DYNAMICSTOREBLOCK) * 2 + size);
@@ -346,7 +346,7 @@ FX_DYNAMICSTORECHUNK* CFX_DynamicStore::AllocChunk(size_t size) {
}
void* CFX_DynamicStore::Alloc(size_t size) {
size = FX_4BYTEALIGN(size);
- FXSYS_assert(size != 0);
+ ASSERT(size != 0);
FX_DYNAMICSTORECHUNK* pChunk = m_pChunk;
FX_DYNAMICSTOREBLOCK* pBlock = NULL;
while (pChunk != NULL) {
@@ -370,7 +370,7 @@ void* CFX_DynamicStore::Alloc(size_t size) {
pChunk = AllocChunk(std::max(m_iDefChunkSize, size));
pBlock = pChunk->FirstBlock();
}
- FXSYS_assert(pChunk != NULL && pBlock != NULL);
+ ASSERT(pChunk != NULL && pBlock != NULL);
size_t m = size + sizeof(FX_DYNAMICSTOREBLOCK);
pBlock->bUsed = TRUE;
if (pBlock->iBlockSize > m) {
@@ -386,7 +386,7 @@ void* CFX_DynamicStore::Alloc(size_t size) {
return pBlock->Data();
}
void CFX_DynamicStore::Free(void* pBlock) {
- FXSYS_assert(pBlock != NULL);
+ ASSERT(pBlock != NULL);
FX_DYNAMICSTORECHUNK* pPriorChunk = NULL;
FX_DYNAMICSTORECHUNK* pChunk = m_pChunk;
while (pChunk != NULL) {
@@ -397,7 +397,7 @@ void CFX_DynamicStore::Free(void* pBlock) {
}
pPriorChunk = pChunk, pChunk = pChunk->pNextChunk;
}
- FXSYS_assert(pChunk != NULL);
+ ASSERT(pChunk != NULL);
FX_DYNAMICSTOREBLOCK* pPriorBlock = NULL;
FX_DYNAMICSTOREBLOCK* pFindBlock = pChunk->FirstBlock();
while (pFindBlock->iBlockSize != 0) {
@@ -407,8 +407,8 @@ void CFX_DynamicStore::Free(void* pBlock) {
pPriorBlock = pFindBlock;
pFindBlock = pFindBlock->NextBlock();
}
- FXSYS_assert(pFindBlock->iBlockSize != 0 && pFindBlock->bUsed &&
- pBlock == (void*)pFindBlock->Data());
+ ASSERT(pFindBlock->iBlockSize != 0 && pFindBlock->bUsed &&
+ pBlock == (void*)pFindBlock->Data());
pFindBlock->bUsed = FALSE;
pChunk->iFreeSize += pFindBlock->iBlockSize;
if (pPriorBlock == NULL) {
@@ -439,7 +439,7 @@ void CFX_DynamicStore::Free(void* pBlock) {
}
}
size_t CFX_DynamicStore::SetDefChunkSize(size_t size) {
- FXSYS_assert(size != 0);
+ ASSERT(size != 0);
size_t v = m_iDefChunkSize;
m_iDefChunkSize = size;
return v;
diff --git a/xfa/fgas/crt/fgas_stream.cpp b/xfa/fgas/crt/fgas_stream.cpp
index 7ee76fa4b4..c05e81ade3 100644
--- a/xfa/fgas/crt/fgas_stream.cpp
+++ b/xfa/fgas/crt/fgas_stream.cpp
@@ -384,8 +384,8 @@ CFX_FileStreamImp::~CFX_FileStreamImp() {
}
FX_BOOL CFX_FileStreamImp::LoadFile(const FX_WCHAR* pszSrcFileName,
uint32_t dwAccess) {
- FXSYS_assert(m_hFile == NULL);
- FXSYS_assert(pszSrcFileName != NULL && FXSYS_wcslen(pszSrcFileName) > 0);
+ ASSERT(m_hFile == NULL);
+ ASSERT(pszSrcFileName != NULL && FXSYS_wcslen(pszSrcFileName) > 0);
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
_FX_OS_ == _FX_WIN64_
const FX_WCHAR* wsMode;
@@ -461,32 +461,32 @@ FX_BOOL CFX_FileStreamImp::LoadFile(const FX_WCHAR* pszSrcFileName,
return TRUE;
}
int32_t CFX_FileStreamImp::GetLength() const {
- FXSYS_assert(m_hFile != NULL);
+ ASSERT(m_hFile != NULL);
return m_iLength;
}
int32_t CFX_FileStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
- FXSYS_assert(m_hFile != NULL);
+ ASSERT(m_hFile != NULL);
FXSYS_fseek(m_hFile, iOffset, eSeek);
return FXSYS_ftell(m_hFile);
}
int32_t CFX_FileStreamImp::GetPosition() {
- FXSYS_assert(m_hFile != NULL);
+ ASSERT(m_hFile != NULL);
return FXSYS_ftell(m_hFile);
}
FX_BOOL CFX_FileStreamImp::IsEOF() const {
- FXSYS_assert(m_hFile != NULL);
+ ASSERT(m_hFile != NULL);
return FXSYS_ftell(m_hFile) >= m_iLength;
}
int32_t CFX_FileStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
- FXSYS_assert(m_hFile != NULL);
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(m_hFile != NULL);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
return FXSYS_fread(pBuffer, 1, iBufferSize, m_hFile);
}
int32_t CFX_FileStreamImp::ReadString(FX_WCHAR* pStr,
int32_t iMaxLength,
FX_BOOL& bEOS) {
- FXSYS_assert(m_hFile != NULL);
- FXSYS_assert(pStr != NULL && iMaxLength > 0);
+ ASSERT(m_hFile != NULL);
+ ASSERT(pStr != NULL && iMaxLength > 0);
if (m_iLength <= 0) {
return 0;
}
@@ -509,8 +509,8 @@ int32_t CFX_FileStreamImp::ReadString(FX_WCHAR* pStr,
}
int32_t CFX_FileStreamImp::WriteData(const uint8_t* pBuffer,
int32_t iBufferSize) {
- FXSYS_assert(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
int32_t iRet = FXSYS_fwrite(pBuffer, 1, iBufferSize, m_hFile);
if (iRet != 0) {
int32_t iPos = FXSYS_ftell(m_hFile);
@@ -521,8 +521,8 @@ int32_t CFX_FileStreamImp::WriteData(const uint8_t* pBuffer,
return iRet;
}
int32_t CFX_FileStreamImp::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
- FXSYS_assert(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
- FXSYS_assert(pStr != NULL && iLength > 0);
+ ASSERT(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
+ ASSERT(pStr != NULL && iLength > 0);
int32_t iRet = FXSYS_fwrite(pStr, 2, iLength, m_hFile);
if (iRet != 0) {
int32_t iPos = FXSYS_ftell(m_hFile);
@@ -533,11 +533,11 @@ int32_t CFX_FileStreamImp::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
return iRet;
}
void CFX_FileStreamImp::Flush() {
- FXSYS_assert(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
+ ASSERT(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
FXSYS_fflush(m_hFile);
}
FX_BOOL CFX_FileStreamImp::SetLength(int32_t iLength) {
- FXSYS_assert(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
+ ASSERT(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
FX_BOOL bRet = FX_fsetsize(m_hFile, iLength);
m_iLength = FX_filelength(m_hFile);
return bRet;
@@ -546,7 +546,7 @@ CFX_FileReadStreamImp::CFX_FileReadStreamImp()
: m_pFileRead(NULL), m_iPosition(0), m_iLength(0) {}
FX_BOOL CFX_FileReadStreamImp::LoadFileRead(IFX_FileRead* pFileRead,
uint32_t dwAccess) {
- FXSYS_assert(m_pFileRead == NULL && pFileRead != NULL);
+ ASSERT(m_pFileRead == NULL && pFileRead != NULL);
if (dwAccess & FX_STREAMACCESS_Write) {
return FALSE;
}
@@ -580,8 +580,8 @@ FX_BOOL CFX_FileReadStreamImp::IsEOF() const {
return m_iPosition >= m_iLength;
}
int32_t CFX_FileReadStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
- FXSYS_assert(m_pFileRead != NULL);
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(m_pFileRead != NULL);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
if (iBufferSize > m_iLength - m_iPosition) {
iBufferSize = m_iLength - m_iPosition;
}
@@ -594,8 +594,8 @@ int32_t CFX_FileReadStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
int32_t CFX_FileReadStreamImp::ReadString(FX_WCHAR* pStr,
int32_t iMaxLength,
FX_BOOL& bEOS) {
- FXSYS_assert(m_pFileRead != NULL);
- FXSYS_assert(pStr != NULL && iMaxLength > 0);
+ ASSERT(m_pFileRead != NULL);
+ ASSERT(pStr != NULL && iMaxLength > 0);
iMaxLength = ReadData((uint8_t*)pStr, iMaxLength * 2) / 2;
if (iMaxLength <= 0) {
return 0;
@@ -621,7 +621,7 @@ FX_BOOL CFX_BufferReadStreamImp::LoadBufferRead(IFX_BufferRead* pBufferRead,
int32_t iFileSize,
uint32_t dwAccess,
FX_BOOL bReleaseBufferRead) {
- FXSYS_assert(m_pBufferRead == NULL && pBufferRead != NULL);
+ ASSERT(m_pBufferRead == NULL && pBufferRead != NULL);
if (dwAccess & FX_STREAMACCESS_Write) {
return FALSE;
}
@@ -669,8 +669,8 @@ FX_BOOL CFX_BufferReadStreamImp::IsEOF() const {
}
int32_t CFX_BufferReadStreamImp::ReadData(uint8_t* pBuffer,
int32_t iBufferSize) {
- FXSYS_assert(m_pBufferRead != NULL);
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(m_pBufferRead != NULL);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
int32_t iLength = GetLength();
if (m_iPosition >= iLength) {
return 0;
@@ -724,8 +724,8 @@ int32_t CFX_BufferReadStreamImp::ReadData(uint8_t* pBuffer,
int32_t CFX_BufferReadStreamImp::ReadString(FX_WCHAR* pStr,
int32_t iMaxLength,
FX_BOOL& bEOS) {
- FXSYS_assert(m_pBufferRead != NULL);
- FXSYS_assert(pStr != NULL && iMaxLength > 0);
+ ASSERT(m_pBufferRead != NULL);
+ ASSERT(pStr != NULL && iMaxLength > 0);
iMaxLength = ReadData((uint8_t*)pStr, iMaxLength * 2) / 2;
if (iMaxLength <= 0) {
return 0;
@@ -741,7 +741,7 @@ CFX_FileWriteStreamImp::CFX_FileWriteStreamImp()
: m_pFileWrite(NULL), m_iPosition(0) {}
FX_BOOL CFX_FileWriteStreamImp::LoadFileWrite(IFX_FileWrite* pFileWrite,
uint32_t dwAccess) {
- FXSYS_assert(m_pFileWrite == NULL && pFileWrite != NULL);
+ ASSERT(m_pFileWrite == NULL && pFileWrite != NULL);
if (dwAccess & FX_STREAMACCESS_Read) {
return FALSE;
}
@@ -808,8 +808,8 @@ CFX_BufferStreamImp::CFX_BufferStreamImp()
FX_BOOL CFX_BufferStreamImp::LoadBuffer(uint8_t* pData,
int32_t iTotalSize,
uint32_t dwAccess) {
- FXSYS_assert(m_pData == NULL);
- FXSYS_assert(pData != NULL && iTotalSize > 0);
+ ASSERT(m_pData == NULL);
+ ASSERT(pData != NULL && iTotalSize > 0);
m_dwAccess = dwAccess;
m_pData = pData;
m_iTotalSize = iTotalSize;
@@ -818,11 +818,11 @@ FX_BOOL CFX_BufferStreamImp::LoadBuffer(uint8_t* pData,
return TRUE;
}
int32_t CFX_BufferStreamImp::GetLength() const {
- FXSYS_assert(m_pData != NULL);
+ ASSERT(m_pData != NULL);
return m_iLength;
}
int32_t CFX_BufferStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
- FXSYS_assert(m_pData != NULL);
+ ASSERT(m_pData != NULL);
if (eSeek == FX_STREAMSEEK_Begin) {
m_iPosition = iOffset;
} else if (eSeek == FX_STREAMSEEK_Current) {
@@ -839,16 +839,16 @@ int32_t CFX_BufferStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
return m_iPosition;
}
int32_t CFX_BufferStreamImp::GetPosition() {
- FXSYS_assert(m_pData != NULL);
+ ASSERT(m_pData != NULL);
return m_iPosition;
}
FX_BOOL CFX_BufferStreamImp::IsEOF() const {
- FXSYS_assert(m_pData != NULL);
+ ASSERT(m_pData != NULL);
return m_iPosition >= m_iLength;
}
int32_t CFX_BufferStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
- FXSYS_assert(m_pData != NULL);
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(m_pData != NULL);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
int32_t iLen = std::min(m_iLength - m_iPosition, iBufferSize);
if (iLen <= 0) {
return 0;
@@ -860,8 +860,8 @@ int32_t CFX_BufferStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
int32_t CFX_BufferStreamImp::ReadString(FX_WCHAR* pStr,
int32_t iMaxLength,
FX_BOOL& bEOS) {
- FXSYS_assert(m_pData != NULL);
- FXSYS_assert(pStr != NULL && iMaxLength > 0);
+ ASSERT(m_pData != NULL);
+ ASSERT(pStr != NULL && iMaxLength > 0);
int32_t iLen = std::min((m_iLength - m_iPosition) / 2, iMaxLength);
if (iLen <= 0) {
return 0;
@@ -878,8 +878,8 @@ int32_t CFX_BufferStreamImp::ReadString(FX_WCHAR* pStr,
}
int32_t CFX_BufferStreamImp::WriteData(const uint8_t* pBuffer,
int32_t iBufferSize) {
- FXSYS_assert(m_pData != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(m_pData != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
int32_t iLen = std::min(m_iTotalSize - m_iPosition, iBufferSize);
if (iLen <= 0) {
return 0;
@@ -893,8 +893,8 @@ int32_t CFX_BufferStreamImp::WriteData(const uint8_t* pBuffer,
}
int32_t CFX_BufferStreamImp::WriteString(const FX_WCHAR* pStr,
int32_t iLength) {
- FXSYS_assert(m_pData != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
- FXSYS_assert(pStr != NULL && iLength > 0);
+ ASSERT(m_pData != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
+ ASSERT(pStr != NULL && iLength > 0);
int32_t iLen = std::min((m_iTotalSize - m_iPosition) / 2, iLength);
if (iLen <= 0) {
return 0;
@@ -908,7 +908,7 @@ int32_t CFX_BufferStreamImp::WriteString(const FX_WCHAR* pStr,
}
IFX_Stream* IFX_Stream::CreateTextStream(IFX_Stream* pBaseStream,
FX_BOOL bDeleteOnRelease) {
- FXSYS_assert(pBaseStream != NULL);
+ ASSERT(pBaseStream != NULL);
return new CFX_TextStream(pBaseStream, bDeleteOnRelease);
}
CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, FX_BOOL bDelStream)
@@ -920,7 +920,7 @@ CFX_TextStream::CFX_TextStream(IFX_Stream* pStream, FX_BOOL bDelStream)
m_bDelStream(bDelStream),
m_pStreamImp(pStream),
m_iRefCount(1) {
- FXSYS_assert(m_pStreamImp != NULL);
+ ASSERT(m_pStreamImp != NULL);
m_pStreamImp->Retain();
InitStream();
}
@@ -1049,7 +1049,7 @@ int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
int32_t iMaxLength,
FX_BOOL& bEOS,
int32_t const* pByteSize) {
- FXSYS_assert(pStr != NULL && iMaxLength > 0);
+ ASSERT(pStr != NULL && iMaxLength > 0);
if (m_pStreamImp == NULL) {
return -1;
}
@@ -1099,7 +1099,7 @@ int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
return iMaxLength;
}
int32_t CFX_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
- FXSYS_assert(pStr != NULL && iLength > 0);
+ ASSERT(pStr != NULL && iLength > 0);
if ((m_pStreamImp->GetAccessModes() & FX_STREAMACCESS_Write) == 0) {
return -1;
}
@@ -1302,7 +1302,7 @@ FX_BOOL CFX_Stream::IsEOF() const {
return m_iPosition >= m_iStart + m_iLength;
}
int32_t CFX_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
if (m_pStreamImp == NULL) {
return -1;
}
@@ -1321,7 +1321,7 @@ int32_t CFX_Stream::ReadString(FX_WCHAR* pStr,
int32_t iMaxLength,
FX_BOOL& bEOS,
int32_t const* pByteSize) {
- FXSYS_assert(pStr != NULL && iMaxLength > 0);
+ ASSERT(pStr != NULL && iMaxLength > 0);
if (m_pStreamImp == NULL) {
return -1;
}
@@ -1346,7 +1346,7 @@ int32_t CFX_Stream::ReadString(FX_WCHAR* pStr,
}
int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
- FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
+ ASSERT(pBuffer != NULL && iBufferSize > 0);
if (m_pStreamImp == NULL) {
return -1;
}
@@ -1372,7 +1372,7 @@ int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
return iLen;
}
int32_t CFX_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) {
- FXSYS_assert(pStr != NULL && iLength > 0);
+ ASSERT(pStr != NULL && iLength > 0);
if (m_pStreamImp == NULL) {
return -1;
}
@@ -1438,7 +1438,7 @@ uint16_t CFX_Stream::SetCodePage(uint16_t wCodePage) {
IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
int32_t iOffset,
int32_t iLength) {
- FXSYS_assert(iLength > 0);
+ ASSERT(iLength > 0);
if (m_pStreamImp == NULL) {
return NULL;
}
@@ -1474,12 +1474,12 @@ IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
}
IFX_FileRead* FX_CreateFileRead(IFX_Stream* pBaseStream,
FX_BOOL bReleaseStream) {
- FXSYS_assert(pBaseStream != NULL);
+ ASSERT(pBaseStream != NULL);
return new CFGAS_FileRead(pBaseStream, bReleaseStream);
}
CFGAS_FileRead::CFGAS_FileRead(IFX_Stream* pStream, FX_BOOL bReleaseStream)
: m_bReleaseStream(bReleaseStream), m_pStream(pStream) {
- FXSYS_assert(m_pStream != NULL);
+ ASSERT(m_pStream != NULL);
}
CFGAS_FileRead::~CFGAS_FileRead() {
if (m_bReleaseStream) {
@@ -1511,7 +1511,7 @@ CFX_BufferAccImp::CFX_BufferAccImp(IFX_BufferRead* pBufferRead,
: m_pBufferRead(pBufferRead),
m_bReleaseStream(bReleaseStream),
m_iBufSize(iFileSize) {
- FXSYS_assert(m_pBufferRead);
+ ASSERT(m_pBufferRead);
}
CFX_BufferAccImp::~CFX_BufferAccImp() {
if (m_bReleaseStream && m_pBufferRead) {
@@ -1593,13 +1593,13 @@ FX_BOOL CFX_BufferAccImp::ReadBlock(void* buffer,
IFX_FileWrite* FX_CreateFileWrite(IFX_Stream* pBaseStream,
FX_BOOL bReleaseStream) {
- FXSYS_assert(pBaseStream != NULL);
+ ASSERT(pBaseStream != NULL);
return new CFGAS_FileWrite(pBaseStream, bReleaseStream);
}
CFGAS_FileWrite::CFGAS_FileWrite(IFX_Stream* pStream, FX_BOOL bReleaseStream)
: m_pStream(pStream), m_bReleaseStream(bReleaseStream) {
- FXSYS_assert(m_pStream != NULL);
+ ASSERT(m_pStream != NULL);
}
CFGAS_FileWrite::~CFGAS_FileWrite() {
if (m_bReleaseStream) {
diff --git a/xfa/fgas/crt/fgas_system.cpp b/xfa/fgas/crt/fgas_system.cpp
index 7ba2d924ca..3ab39268ef 100644
--- a/xfa/fgas/crt/fgas_system.cpp
+++ b/xfa/fgas/crt/fgas_system.cpp
@@ -30,7 +30,7 @@ inline int32_t FX_tolower(int32_t ch) {
} // namespace
int32_t FX_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count) {
- FXSYS_assert(s1 != NULL && s2 != NULL && count > 0);
+ ASSERT(s1 != NULL && s2 != NULL && count > 0);
FX_WCHAR wch1 = 0;
FX_WCHAR wch2 = 0;
while (count-- > 0) {
@@ -44,7 +44,7 @@ int32_t FX_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count) {
}
int32_t FX_filelength(FXSYS_FILE* file) {
- FXSYS_assert(file != NULL);
+ ASSERT(file != NULL);
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
return _filelength(_fileno(file));
#else
@@ -57,7 +57,7 @@ int32_t FX_filelength(FXSYS_FILE* file) {
}
FX_BOOL FX_fsetsize(FXSYS_FILE* file, int32_t size) {
- FXSYS_assert(file != NULL);
+ ASSERT(file != NULL);
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_
return _chsize(_fileno(file), size) == 0;
#elif _FX_OS_ == _FX_WIN32_MOBILE_
@@ -73,7 +73,7 @@ FX_BOOL FX_fsetsize(FXSYS_FILE* file, int32_t size) {
}
FX_FLOAT FX_wcstof(const FX_WCHAR* pwsStr, int32_t iLength, int32_t* pUsedLen) {
- FXSYS_assert(pwsStr != NULL);
+ ASSERT(pwsStr != NULL);
if (iLength < 0) {
iLength = FXSYS_wcslen(pwsStr);
}
diff --git a/xfa/fgas/crt/fgas_utils.cpp b/xfa/fgas/crt/fgas_utils.cpp
index 0d020ec38f..01792b833a 100644
--- a/xfa/fgas/crt/fgas_utils.cpp
+++ b/xfa/fgas/crt/fgas_utils.cpp
@@ -28,7 +28,7 @@ class FX_BASEARRAYDATA : public CFX_Target {
uint8_t* pBuffer;
};
CFX_BaseArray::CFX_BaseArray(int32_t iGrowSize, int32_t iBlockSize) {
- FXSYS_assert(iGrowSize > 0 && iBlockSize > 0);
+ ASSERT(iGrowSize > 0 && iBlockSize > 0);
m_pData = new FX_BASEARRAYDATA(iGrowSize, iBlockSize);
}
CFX_BaseArray::~CFX_BaseArray() {
@@ -42,7 +42,7 @@ int32_t CFX_BaseArray::GetBlockSize() const {
return m_pData->iBlockSize;
}
uint8_t* CFX_BaseArray::AddSpaceTo(int32_t index) {
- FXSYS_assert(index > -1);
+ ASSERT(index > -1);
uint8_t*& pBuffer = m_pData->pBuffer;
int32_t& iTotalCount = m_pData->iTotalCount;
int32_t iBlockSize = m_pData->iBlockSize;
@@ -63,7 +63,7 @@ uint8_t* CFX_BaseArray::AddSpaceTo(int32_t index) {
return pBuffer + index * iBlockSize;
}
uint8_t* CFX_BaseArray::GetAt(int32_t index) const {
- FXSYS_assert(index > -1 && index < m_pData->iBlockCount);
+ ASSERT(index > -1 && index < m_pData->iBlockCount);
return m_pData->pBuffer + index * m_pData->iBlockSize;
}
uint8_t* CFX_BaseArray::GetBuffer() const {
@@ -73,10 +73,10 @@ int32_t CFX_BaseArray::Append(const CFX_BaseArray& src,
int32_t iStart,
int32_t iCount) {
int32_t iBlockSize = m_pData->iBlockSize;
- FXSYS_assert(iBlockSize == src.m_pData->iBlockSize);
+ ASSERT(iBlockSize == src.m_pData->iBlockSize);
int32_t& iBlockCount = m_pData->iBlockCount;
int32_t iAdded = src.GetSize();
- FXSYS_assert(iStart > -1 && iStart < iAdded);
+ ASSERT(iStart > -1 && iStart < iAdded);
if (iCount < 0) {
iCount = iAdded;
}
@@ -96,9 +96,9 @@ int32_t CFX_BaseArray::Copy(const CFX_BaseArray& src,
int32_t iStart,
int32_t iCount) {
int32_t iBlockSize = m_pData->iBlockSize;
- FXSYS_assert(iBlockSize == src.m_pData->iBlockSize);
+ ASSERT(iBlockSize == src.m_pData->iBlockSize);
int32_t iCopied = src.GetSize();
- FXSYS_assert(iStart > -1 && iStart < iCopied);
+ ASSERT(iStart > -1 && iStart < iCopied);
if (iCount < 0) {
iCount = iCopied;
}
@@ -142,7 +142,7 @@ CFX_BaseMassArrayImp::CFX_BaseMassArrayImp(int32_t iChunkSize,
m_iBlockSize(iBlockSize),
m_iChunkCount(0),
m_iBlockCount(0) {
- FXSYS_assert(m_iChunkSize > 0 && m_iBlockSize > 0);
+ ASSERT(m_iChunkSize > 0 && m_iBlockSize > 0);
m_pData = new CFX_PtrArray;
m_pData->SetSize(16);
}
@@ -151,7 +151,7 @@ CFX_BaseMassArrayImp::~CFX_BaseMassArrayImp() {
delete m_pData;
}
uint8_t* CFX_BaseMassArrayImp::AddSpaceTo(int32_t index) {
- FXSYS_assert(index > -1);
+ ASSERT(index > -1);
uint8_t* pChunk;
if (index < m_iBlockCount) {
pChunk = (uint8_t*)m_pData->GetAt(index / m_iChunkSize);
@@ -172,22 +172,22 @@ uint8_t* CFX_BaseMassArrayImp::AddSpaceTo(int32_t index) {
}
}
}
- FXSYS_assert(pChunk != NULL);
+ ASSERT(pChunk != NULL);
m_iBlockCount = index + 1;
return pChunk + (index % m_iChunkSize) * m_iBlockSize;
}
uint8_t* CFX_BaseMassArrayImp::GetAt(int32_t index) const {
- FXSYS_assert(index > -1 && index < m_iBlockCount);
+ ASSERT(index > -1 && index < m_iBlockCount);
uint8_t* pChunk = (uint8_t*)m_pData->GetAt(index / m_iChunkSize);
- FXSYS_assert(pChunk != NULL);
+ ASSERT(pChunk != NULL);
return pChunk + (index % m_iChunkSize) * m_iBlockSize;
}
int32_t CFX_BaseMassArrayImp::Append(const CFX_BaseMassArrayImp& src,
int32_t iStart,
int32_t iCount) {
- FXSYS_assert(m_iBlockSize == src.m_iBlockSize);
+ ASSERT(m_iBlockSize == src.m_iBlockSize);
int32_t iAdded = src.m_iBlockCount;
- FXSYS_assert(iStart > -1 && iStart < iAdded);
+ ASSERT(iStart > -1 && iStart < iAdded);
if (iCount < 0) {
iCount = iAdded;
}
@@ -206,9 +206,9 @@ int32_t CFX_BaseMassArrayImp::Append(const CFX_BaseMassArrayImp& src,
int32_t CFX_BaseMassArrayImp::Copy(const CFX_BaseMassArrayImp& src,
int32_t iStart,
int32_t iCount) {
- FXSYS_assert(m_iBlockSize == src.m_iBlockSize);
+ ASSERT(m_iBlockSize == src.m_iBlockSize);
int32_t iCopied = src.m_iBlockCount;
- FXSYS_assert(iStart > -1);
+ ASSERT(iStart > -1);
if (iStart >= iCopied) {
return 0;
}
@@ -233,14 +233,14 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart,
const CFX_BaseMassArrayImp& src,
int32_t iSrcStart,
int32_t iSrcCount) {
- FXSYS_assert(iDstStart > -1);
- FXSYS_assert(m_iBlockSize == src.m_iBlockSize);
- FXSYS_assert(src.m_iBlockCount > 0);
- FXSYS_assert(m_iBlockCount >= iDstStart + iSrcCount);
- FXSYS_assert(iSrcStart > -1);
- FXSYS_assert(iSrcStart < src.m_iBlockCount);
- FXSYS_assert(iSrcCount > 0);
- FXSYS_assert(iSrcStart + iSrcCount <= src.m_iBlockCount);
+ ASSERT(iDstStart > -1);
+ ASSERT(m_iBlockSize == src.m_iBlockSize);
+ ASSERT(src.m_iBlockCount > 0);
+ ASSERT(m_iBlockCount >= iDstStart + iSrcCount);
+ ASSERT(iSrcStart > -1);
+ ASSERT(iSrcStart < src.m_iBlockCount);
+ ASSERT(iSrcCount > 0);
+ ASSERT(iSrcStart + iSrcCount <= src.m_iBlockCount);
int32_t iDstChunkIndex = iDstStart / m_iChunkSize;
int32_t iSrcChunkIndex = iSrcStart / src.m_iChunkSize;
@@ -252,7 +252,7 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart,
std::min(iSrcCount, std::min(iSrcChunkSize, iDstChunkSize));
int32_t iCopyBytes = iCopySize * m_iBlockSize;
while (iSrcCount > 0) {
- FXSYS_assert(pDstChunk != NULL && pSrcChunk != NULL);
+ ASSERT(pDstChunk != NULL && pSrcChunk != NULL);
FXSYS_memcpy(pDstChunk, pSrcChunk, iCopyBytes);
iSrcCount -= iCopySize;
iSrcChunkSize -= iCopySize;
@@ -340,7 +340,7 @@ struct FX_BASEDISCRETEARRAYDATA {
CFX_BaseDiscreteArray::CFX_BaseDiscreteArray(int32_t iChunkSize,
int32_t iBlockSize) {
- FXSYS_assert(iChunkSize > 0 && iBlockSize > 0);
+ ASSERT(iChunkSize > 0 && iBlockSize > 0);
FX_BASEDISCRETEARRAYDATA* pData = new FX_BASEDISCRETEARRAYDATA;
m_pData = pData;
pData->ChunkBuffer.SetSize(16);
@@ -353,7 +353,7 @@ CFX_BaseDiscreteArray::~CFX_BaseDiscreteArray() {
delete static_cast<FX_BASEDISCRETEARRAYDATA*>(m_pData);
}
uint8_t* CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) {
- FXSYS_assert(index > -1);
+ ASSERT(index > -1);
FX_BASEDISCRETEARRAYDATA* pData = (FX_BASEDISCRETEARRAYDATA*)m_pData;
int32_t& iChunkCount = pData->iChunkCount;
int32_t iChunkSize = pData->iChunkSize;
@@ -373,7 +373,7 @@ uint8_t* CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) {
return pChunk + (index % iChunkSize) * pData->iBlockSize;
}
uint8_t* CFX_BaseDiscreteArray::GetAt(int32_t index) const {
- FXSYS_assert(index > -1);
+ ASSERT(index > -1);
FX_BASEDISCRETEARRAYDATA* pData = (FX_BASEDISCRETEARRAYDATA*)m_pData;
int32_t iChunkSize = pData->iChunkSize;
int32_t iChunk = index / iChunkSize;
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h
index 5ebb32ff37..ebbcf4bd97 100644
--- a/xfa/fgas/crt/fgas_utils.h
+++ b/xfa/fgas/crt/fgas_utils.h
@@ -110,12 +110,12 @@ class CFX_ObjectBaseArrayTemplate : public CFX_BaseArray {
int32_t Append(const CFX_ObjectBaseArrayTemplate& src,
int32_t iStart = 0,
int32_t iCount = -1) {
- FXSYS_assert(GetBlockSize() == src.GetBlockSize());
+ ASSERT(GetBlockSize() == src.GetBlockSize());
if (iCount == 0) {
return 0;
}
int32_t iSize = src.GetSize();
- FXSYS_assert(iStart > -1 && iStart < iSize);
+ ASSERT(iStart > -1 && iStart < iSize);
if (iCount < 0) {
iCount = iSize;
}
@@ -139,12 +139,12 @@ class CFX_ObjectBaseArrayTemplate : public CFX_BaseArray {
int32_t Copy(const CFX_ObjectBaseArrayTemplate& src,
int32_t iStart = 0,
int32_t iCount = -1) {
- FXSYS_assert(GetBlockSize() == src.GetBlockSize());
+ ASSERT(GetBlockSize() == src.GetBlockSize());
if (iCount == 0) {
return 0;
}
int32_t iSize = src.GetSize();
- FXSYS_assert(iStart > -1 && iStart < iSize);
+ ASSERT(iStart > -1 && iStart < iSize);
if (iCount < 0) {
iCount = iSize;
}
@@ -312,7 +312,7 @@ class CFX_ObjectMassArrayTemplate : public CFX_BaseMassArray {
return CFX_BaseMassArray::GetSize();
}
int32_t iSize = src.GetSize();
- FXSYS_assert(iStart > -1 && iStart < iSize);
+ ASSERT(iStart > -1 && iStart < iSize);
if (iCount < 0) {
iCount = iSize;
}
@@ -332,7 +332,7 @@ class CFX_ObjectMassArrayTemplate : public CFX_BaseMassArray {
return CFX_BaseMassArray::GetSize();
}
int32_t iSize = src.GetSize();
- FXSYS_assert(iStart > -1 && iStart < iSize);
+ ASSERT(iStart > -1 && iStart < iSize);
if (iCount < 0) {
iCount = iSize;
}
@@ -479,7 +479,7 @@ class CFX_ObjectStackTemplate : public CFX_BaseStack {
return CFX_BaseStack::GetSize();
}
int32_t iSize = src.GetSize();
- FXSYS_assert(iStart > -1 && iStart < iSize);
+ ASSERT(iStart > -1 && iStart < iSize);
if (iCount < 0) {
iCount = iSize;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 04:30:38 +0000