Index: core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp |
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp |
index 36be007b680c88dd06387b0e6db5a9c1b09784f4..5ea2aff27deb0f62f118227287b74ca653e2e12a 100644 |
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp |
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp |
@@ -37,9 +37,9 @@ CPDF_StreamParser::~CPDF_StreamParser() { |
} |
} |
-FX_DWORD _DecodeAllScanlines(ICodec_ScanlineDecoder* pDecoder, |
- uint8_t*& dest_buf, |
- FX_DWORD& dest_size) { |
+FX_DWORD DecodeAllScanlines(ICodec_ScanlineDecoder* pDecoder, |
+ uint8_t*& dest_buf, |
+ FX_DWORD& dest_size) { |
if (!pDecoder) { |
return (FX_DWORD)-1; |
Tom Sepez
2016/03/16 18:34:58
nit:static_cast
Wei Li
2016/03/17 02:24:04
Done.
|
} |
@@ -50,7 +50,7 @@ FX_DWORD _DecodeAllScanlines(ICodec_ScanlineDecoder* pDecoder, |
int pitch = (width * ncomps * bpc + 7) / 8; |
if (height == 0 || pitch > (1 << 30) / height) { |
delete pDecoder; |
- return -1; |
+ return static_cast<FX_DWORD>(-1); |
} |
dest_buf = FX_Alloc2D(uint8_t, pitch, height); |
dest_size = pitch * height; // Safe since checked alloc returned. |
@@ -84,7 +84,7 @@ FX_DWORD PDF_DecodeInlineStream(const uint8_t* src_buf, |
if (decoder == "CCITTFaxDecode" || decoder == "CCF") { |
ICodec_ScanlineDecoder* pDecoder = |
FPDFAPI_CreateFaxDecoder(src_buf, limit, width, height, pParam); |
- return _DecodeAllScanlines(pDecoder, dest_buf, dest_size); |
+ return DecodeAllScanlines(pDecoder, dest_buf, dest_size); |
} |
if (decoder == "ASCII85Decode" || decoder == "A85") { |
return A85Decode(src_buf, limit, dest_buf, dest_size); |
@@ -105,7 +105,7 @@ FX_DWORD PDF_DecodeInlineStream(const uint8_t* src_buf, |
CPDF_ModuleMgr::Get()->GetJpegModule()->CreateDecoder( |
src_buf, limit, width, height, 0, |
pParam ? pParam->GetIntegerBy("ColorTransform", 1) : 1); |
- return _DecodeAllScanlines(pDecoder, dest_buf, dest_size); |
+ return DecodeAllScanlines(pDecoder, dest_buf, dest_size); |
} |
if (decoder == "RunLengthDecode" || decoder == "RL") { |
return RunLengthDecode(src_buf, limit, dest_buf, dest_size); |