From aa3a9cd82df9dff1ef136797259e606a39c18b75 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 29 Aug 2017 16:39:44 -0400 Subject: Convert int* references to FX_STRSIZE Through out the code base there are numerous places where variables are declared using a signed integer type when interacting with the string classes, since they assume that FX_STRSIZE is 'int'. As part of changing the underling type of FX_STRSIZE to be unsigned, these locations are being changed to use FX_STRSIZE. This is necessary as part of converting the type, but has been broken off into a separate CL, since it should be low risk. Some related cleanups that are low risk are included as part of this CL. BUG=pdfium:828 Change-Id: Ifaae54ad195ccde0fe8672f71271d29a6ebd65fd Reviewed-on: https://pdfium-review.googlesource.com/12210 Reviewed-by: Tom Sepez Reviewed-by: Henrique Nakashima Reviewed-by: dsinclair Commit-Queue: Ryan Harrison --- core/fpdfapi/page/cpdf_streamparser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/page/cpdf_streamparser.cpp') 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(buf.tellp()), kMaxStringLength)); + return CFX_ByteString(buf.str().c_str(), + std::min(static_cast(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(buf.tellp()), kMaxStringLength)); + std::min(static_cast(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(buf.tellp()), kMaxStringLength)); + std::min(static_cast(buf.tellp()), kMaxStringLength)); } bool CPDF_StreamParser::PositionIsInBounds() const { -- cgit v1.2.3