diff options
-rw-r--r-- | core/fpdfapi/font/cpdf_cmap.cpp | 38 | ||||
-rw-r--r-- | core/fxcrt/cfx_binarybuf.cpp | 3 | ||||
-rw-r--r-- | core/fxcrt/cfx_seekablestreamproxy.cpp | 6 | ||||
-rw-r--r-- | core/fxcrt/cfx_seekablestreamproxy.h | 2 | ||||
-rw-r--r-- | fpdfsdk/javascript/PublicMethods.cpp | 41 | ||||
-rw-r--r-- | fpdfsdk/javascript/PublicMethods.h | 10 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedEAN13Writer.cpp | 10 |
7 files changed, 57 insertions, 53 deletions
diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp index 9e8c48bb27..659139f687 100644 --- a/core/fpdfapi/font/cpdf_cmap.cpp +++ b/core/fpdfapi/font/cpdf_cmap.cpp @@ -434,46 +434,46 @@ int CPDF_CMap::CountChar(const char* pString, int size) const { int CPDF_CMap::AppendChar(char* str, uint32_t charcode) const { switch (m_CodingScheme) { case OneByte: - str[0] = (uint8_t)charcode; + str[0] = static_cast<char>(charcode); return 1; case TwoBytes: - str[0] = (uint8_t)(charcode / 256); - str[1] = (uint8_t)(charcode % 256); + str[0] = static_cast<char>(charcode / 256); + str[1] = static_cast<char>(charcode % 256); return 2; case MixedTwoBytes: - if (charcode < 0x100 && !m_MixedTwoByteLeadingBytes[(uint8_t)charcode]) { - str[0] = (uint8_t)charcode; + if (charcode < 0x100 && !m_MixedTwoByteLeadingBytes[charcode]) { + str[0] = static_cast<char>(charcode); return 1; } - str[0] = (uint8_t)(charcode >> 8); - str[1] = (uint8_t)charcode; + str[0] = static_cast<char>(charcode >> 8); + str[1] = static_cast<char>(charcode); return 2; case MixedFourBytes: if (charcode < 0x100) { - int iSize = - GetFourByteCharSizeImpl(charcode, m_MixedFourByteLeadingRanges); + int iSize = static_cast<int>( + GetFourByteCharSizeImpl(charcode, m_MixedFourByteLeadingRanges)); if (iSize == 0) iSize = 1; - str[iSize - 1] = (uint8_t)charcode; + str[iSize - 1] = static_cast<char>(charcode); if (iSize > 1) memset(str, 0, iSize - 1); return iSize; } if (charcode < 0x10000) { - str[0] = (uint8_t)(charcode >> 8); - str[1] = (uint8_t)charcode; + str[0] = static_cast<char>(charcode >> 8); + str[1] = static_cast<char>(charcode); return 2; } if (charcode < 0x1000000) { - str[0] = (uint8_t)(charcode >> 16); - str[1] = (uint8_t)(charcode >> 8); - str[2] = (uint8_t)charcode; + str[0] = static_cast<char>(charcode >> 16); + str[1] = static_cast<char>(charcode >> 8); + str[2] = static_cast<char>(charcode); return 3; } - str[0] = (uint8_t)(charcode >> 24); - str[1] = (uint8_t)(charcode >> 16); - str[2] = (uint8_t)(charcode >> 8); - str[3] = (uint8_t)charcode; + str[0] = static_cast<char>(charcode >> 24); + str[1] = static_cast<char>(charcode >> 16); + str[2] = static_cast<char>(charcode >> 8); + str[3] = static_cast<char>(charcode); return 4; } return 0; diff --git a/core/fxcrt/cfx_binarybuf.cpp b/core/fxcrt/cfx_binarybuf.cpp index a1388b8d32..6c67912d3b 100644 --- a/core/fxcrt/cfx_binarybuf.cpp +++ b/core/fxcrt/cfx_binarybuf.cpp @@ -51,7 +51,8 @@ void CFX_BinaryBuf::ExpandBuf(FX_STRSIZE add_size) { if (m_AllocSize >= new_size.ValueOrDie()) return; - int alloc_step = std::max(128, m_AllocStep ? m_AllocStep : m_AllocSize / 4); + FX_STRSIZE alloc_step = std::max(static_cast<FX_STRSIZE>(128), + m_AllocStep ? m_AllocStep : m_AllocSize / 4); new_size += alloc_step - 1; // Quantize, don't combine these lines. new_size /= alloc_step; new_size *= alloc_step; diff --git a/core/fxcrt/cfx_seekablestreamproxy.cpp b/core/fxcrt/cfx_seekablestreamproxy.cpp index da1170717a..a67ec52c85 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.cpp +++ b/core/fxcrt/cfx_seekablestreamproxy.cpp @@ -230,15 +230,15 @@ FX_STRSIZE CFX_SeekableStreamProxy::ReadData(uint8_t* pBuffer, FX_STRSIZE CFX_SeekableStreamProxy::ReadString(wchar_t* pStr, FX_STRSIZE iMaxLength, bool* bEOS) { - ASSERT(pStr); - ASSERT(iMaxLength > 0); + if (!pStr || iMaxLength <= 0) + return 0; if (m_IsWriteStream) return 0; if (m_wCodePage == FX_CODEPAGE_UTF16LE || m_wCodePage == FX_CODEPAGE_UTF16BE) { - FX_FILESIZE iBytes = iMaxLength * 2; + FX_STRSIZE iBytes = iMaxLength * 2; FX_STRSIZE iLen = ReadData(reinterpret_cast<uint8_t*>(pStr), iBytes); iMaxLength = iLen / 2; if (sizeof(wchar_t) > 2 && iMaxLength > 0) diff --git a/core/fxcrt/cfx_seekablestreamproxy.h b/core/fxcrt/cfx_seekablestreamproxy.h index 1a8e6f2f3b..0e427fc79b 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.h +++ b/core/fxcrt/cfx_seekablestreamproxy.h @@ -25,7 +25,7 @@ class CFX_SeekableStreamProxy : public CFX_Retainable { FX_FILESIZE GetLength() const { return m_pStream->GetSize(); } FX_FILESIZE GetPosition() { return m_iPosition; } - FX_STRSIZE GetBOMLength() const { return std::max(0, m_wBOMLength); } + FX_STRSIZE GetBOMLength() const { return m_wBOMLength; } bool IsEOF() const { return m_iPosition >= GetLength(); } void Seek(From eSeek, FX_FILESIZE iOffset); diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index ee5bbbacb8..970bbd2c75 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -226,12 +226,12 @@ CJS_Array CJS_PublicMethods::AF_MakeArrayFromList(CJS_Runtime* pRuntime, } int CJS_PublicMethods::ParseStringInteger(const CFX_WideString& str, - int nStart, - int& nSkip, - int nMaxStep) { + FX_STRSIZE nStart, + FX_STRSIZE& nSkip, + FX_STRSIZE nMaxStep) { int nRet = 0; nSkip = 0; - for (int i = nStart, sz = str.GetLength(); i < sz; i++) { + for (FX_STRSIZE i = nStart, sz = str.GetLength(); i < sz; i++) { if (i - nStart > 10) break; @@ -249,11 +249,11 @@ int CJS_PublicMethods::ParseStringInteger(const CFX_WideString& str, } CFX_WideString CJS_PublicMethods::ParseStringString(const CFX_WideString& str, - int nStart, - int& nSkip) { + FX_STRSIZE nStart, + FX_STRSIZE& nSkip) { CFX_WideString swRet; nSkip = 0; - for (int i = nStart, sz = str.GetLength(); i < sz; i++) { + for (FX_STRSIZE i = nStart, sz = str.GetLength(); i < sz; i++) { wchar_t c = str[i]; if (!std::iswdigit(c)) break; @@ -278,10 +278,10 @@ double CJS_PublicMethods::ParseNormalDate(const CFX_WideString& value, int number[3]; - int nSkip = 0; - int nLen = value.GetLength(); - int nIndex = 0; - int i = 0; + FX_STRSIZE nSkip = 0; + FX_STRSIZE nLen = value.GetLength(); + FX_STRSIZE nIndex = 0; + FX_STRSIZE i = 0; while (i < nLen) { if (nIndex > 2) break; @@ -367,7 +367,7 @@ double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value, bool bBadFormat = false; FX_STRSIZE i = 0; - int j = 0; + FX_STRSIZE j = 0; while (i < format.GetLength()) { if (bExit) @@ -392,8 +392,8 @@ double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value, case 'M': case 's': case 't': { - int oldj = j; - int nSkip = 0; + FX_STRSIZE oldj = j; + FX_STRSIZE nSkip = 0; FX_STRSIZE remaining = format.GetLength() - i - 1; if (remaining == 0 || format[i + 1] != c) { @@ -806,7 +806,7 @@ bool CJS_PublicMethods::AFNumber_Format(CJS_Runtime* pRuntime, } // Processing separator style - if (iDec2 < strValue.GetLength()) { + if (static_cast<FX_STRSIZE>(iDec2) < strValue.GetLength()) { if (iSepStyle == 2 || iSepStyle == 3) strValue.Replace(".", ","); @@ -983,8 +983,10 @@ bool CJS_PublicMethods::AFNumber_Keystroke(CJS_Runtime* pRuntime, CFX_WideString wprefix = wstrValue.Left(pEvent->SelStart()); CFX_WideString wpostfix; - if (pEvent->SelEnd() < wstrValue.GetLength()) - wpostfix = wstrValue.Right(wstrValue.GetLength() - pEvent->SelEnd()); + if (pEvent->SelEnd() >= 0 && + static_cast<FX_STRSIZE>(pEvent->SelEnd()) < wstrValue.GetLength()) + wpostfix = wstrValue.Right(wstrValue.GetLength() - + static_cast<FX_STRSIZE>(pEvent->SelEnd())); val = wprefix + wstrChange + wpostfix; return true; } @@ -1537,8 +1539,9 @@ bool CJS_PublicMethods::AFMergeChange(CJS_Runtime* pRuntime, prefix = L""; if (pEventHandler->SelEnd() >= 0 && - pEventHandler->SelEnd() <= swValue.GetLength()) - postfix = swValue.Right(swValue.GetLength() - pEventHandler->SelEnd()); + static_cast<FX_STRSIZE>(pEventHandler->SelEnd()) <= swValue.GetLength()) + postfix = swValue.Right(swValue.GetLength() - + static_cast<FX_STRSIZE>(pEventHandler->SelEnd())); else postfix = L""; diff --git a/fpdfsdk/javascript/PublicMethods.h b/fpdfsdk/javascript/PublicMethods.h index 0f6123cd17..c373f51322 100644 --- a/fpdfsdk/javascript/PublicMethods.h +++ b/fpdfsdk/javascript/PublicMethods.h @@ -133,12 +133,12 @@ class CJS_PublicMethods : public CJS_Object { JS_STATIC_DECLARE_GLOBAL_FUN(); static int ParseStringInteger(const CFX_WideString& string, - int nStart, - int& nSkip, - int nMaxStep); + FX_STRSIZE nStart, + FX_STRSIZE& nSkip, + FX_STRSIZE nMaxStep); static CFX_WideString ParseStringString(const CFX_WideString& string, - int nStart, - int& nSkip); + FX_STRSIZE nStart, + FX_STRSIZE& nSkip); static double MakeRegularDate(const CFX_WideString& value, const CFX_WideString& format, bool* bWrongFormat); diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 9a48c1ebae..6d8d51d495 100644 --- a/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -27,6 +27,7 @@ #include <memory> #include <vector> +#include "core/fxcrt/fx_extension.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "fxbarcode/BC_Writer.h" #include "fxbarcode/oned/BC_OneDimWriter.h" @@ -81,15 +82,14 @@ int32_t CBC_OnedEAN13Writer::CalcChecksum(const CFX_ByteString& contents) { FX_STRSIZE j = 1; for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) { if (j % 2) { - odd += FXSYS_atoi(contents.Mid(i, 1).c_str()); + odd += FXSYS_DecimalCharToInt(contents[i]); } else { - even += FXSYS_atoi(contents.Mid(i, 1).c_str()); + even += FXSYS_DecimalCharToInt(contents[i]); } j++; } - int32_t checksum = (odd * 3 + even) % 10; - checksum = (10 - checksum) % 10; - return (checksum); + int32_t checksum = 10 - (odd * 3 + even) % 10; + return checksum; } uint8_t* CBC_OnedEAN13Writer::EncodeWithHint(const CFX_ByteString& contents, |