diff options
Diffstat (limited to 'core/fpdfapi/page')
| -rw-r--r-- | core/fpdfapi/page/cpdf_image.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamparser.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index efdd66b442..2c3f13e9c2 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -257,7 +257,7 @@ void CPDF_Image::SetImage(const CFX_RetainPtr<CFX_DIBitmap>& pBitmap) { int32_t maskWidth = pMaskBitmap->GetWidth(); int32_t maskHeight = pMaskBitmap->GetHeight(); std::unique_ptr<uint8_t, FxFreeDeleter> mask_buf; - FX_STRSIZE mask_size = 0; + int32_t mask_size = 0; auto pMaskDict = pdfium::MakeUnique<CPDF_Dictionary>(m_pDocument->GetByteStringPool()); pMaskDict->SetNewFor<CPDF_Name>("Type", "XObject"); diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp index 9d7dd1ed55..f745331818 100644 --- a/core/fpdfapi/page/cpdf_streamparser.cpp +++ b/core/fpdfapi/page/cpdf_streamparser.cpp @@ -478,9 +478,9 @@ CFX_ByteString CPDF_StreamParser::ReadString() { case 0: if (ch == ')') { if (parlevel == 0) { - return CFX_ByteString( - buf.str().c_str(), - std::min(static_cast<int>(buf.tellp()), kMaxStringLength)); + return CFX_ByteString(buf.str().c_str(), + std::min(static_cast<FX_STRSIZE>(buf.tellp()), + kMaxStringLength)); } parlevel--; buf << ')'; @@ -557,7 +557,7 @@ CFX_ByteString CPDF_StreamParser::ReadString() { return CFX_ByteString( buf.str().c_str(), - std::min(static_cast<int>(buf.tellp()), kMaxStringLength)); + std::min(static_cast<FX_STRSIZE>(buf.tellp()), kMaxStringLength)); } CFX_ByteString CPDF_StreamParser::ReadHexString() { @@ -590,7 +590,7 @@ CFX_ByteString CPDF_StreamParser::ReadHexString() { return CFX_ByteString( buf.str().c_str(), - std::min(static_cast<int>(buf.tellp()), kMaxStringLength)); + std::min(static_cast<FX_STRSIZE>(buf.tellp()), kMaxStringLength)); } bool CPDF_StreamParser::PositionIsInBounds() const { |