Index: core/fpdfapi/parser/fpdf_parser_decode.cpp |
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp |
index ed379c7028d1f78d7e6185dd657421e69733585f..6398c718351953840ab4f1365556fa67077e61ec 100644 |
--- a/core/fpdfapi/parser/fpdf_parser_decode.cpp |
+++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp |
@@ -297,7 +297,7 @@ CCodec_ScanlineDecoder* FPDFAPI_CreateFlateDecoder( |
BitsPerComponent, Columns); |
} |
-uint32_t FPDFAPI_FlateOrLZWDecode(FX_BOOL bLZW, |
+uint32_t FPDFAPI_FlateOrLZWDecode(bool bLZW, |
const uint8_t* src_buf, |
uint32_t src_size, |
CPDF_Dictionary* pParams, |
@@ -308,7 +308,7 @@ uint32_t FPDFAPI_FlateOrLZWDecode(FX_BOOL bLZW, |
int Colors = 0; |
int BitsPerComponent = 0; |
int Columns = 0; |
- FX_BOOL bEarlyChange = TRUE; |
+ bool bEarlyChange = true; |
if (pParams) { |
predictor = pParams->GetIntegerFor("Predictor"); |
bEarlyChange = !!pParams->GetIntegerFor("EarlyChange", 1); |
@@ -323,18 +323,18 @@ uint32_t FPDFAPI_FlateOrLZWDecode(FX_BOOL bLZW, |
BitsPerComponent, Columns, estimated_size, dest_buf, dest_size); |
} |
-FX_BOOL PDF_DataDecode(const uint8_t* src_buf, |
- uint32_t src_size, |
- const CPDF_Dictionary* pDict, |
- uint8_t*& dest_buf, |
- uint32_t& dest_size, |
- CFX_ByteString& ImageEncoding, |
- CPDF_Dictionary*& pImageParms, |
- uint32_t last_estimated_size, |
- FX_BOOL bImageAcc) { |
+bool PDF_DataDecode(const uint8_t* src_buf, |
+ uint32_t src_size, |
+ const CPDF_Dictionary* pDict, |
+ uint8_t*& dest_buf, |
+ uint32_t& dest_size, |
+ CFX_ByteString& ImageEncoding, |
+ CPDF_Dictionary*& pImageParms, |
+ uint32_t last_estimated_size, |
+ bool bImageAcc) { |
CPDF_Object* pDecoder = pDict ? pDict->GetDirectObjectFor("Filter") : nullptr; |
if (!pDecoder || (!pDecoder->IsArray() && !pDecoder->IsName())) |
- return FALSE; |
+ return false; |
CPDF_Object* pParams = |
pDict ? pDict->GetDirectObjectFor("DecodeParms") : nullptr; |
@@ -367,12 +367,12 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf, |
dest_buf = (uint8_t*)last_buf; |
dest_size = last_size; |
pImageParms = pParam; |
- return TRUE; |
+ return true; |
} |
- offset = FPDFAPI_FlateOrLZWDecode(FALSE, last_buf, last_size, pParam, |
+ offset = FPDFAPI_FlateOrLZWDecode(false, last_buf, last_size, pParam, |
estimated_size, new_buf, new_size); |
} else if (decoder == "LZWDecode" || decoder == "LZW") { |
- offset = FPDFAPI_FlateOrLZWDecode(TRUE, last_buf, last_size, pParam, |
+ offset = FPDFAPI_FlateOrLZWDecode(true, last_buf, last_size, pParam, |
estimated_size, new_buf, new_size); |
} else if (decoder == "ASCII85Decode" || decoder == "A85") { |
offset = A85Decode(last_buf, last_size, new_buf, new_size); |
@@ -384,7 +384,7 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf, |
dest_buf = (uint8_t*)last_buf; |
dest_size = last_size; |
pImageParms = pParam; |
- return TRUE; |
+ return true; |
} |
offset = RunLengthDecode(last_buf, last_size, new_buf, new_size); |
} else if (decoder == "Crypt") { |
@@ -402,14 +402,14 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf, |
dest_size = last_size; |
if (CPDF_Array* pDecoders = pDecoder->AsArray()) |
pDecoders->RemoveAt(i + 1, pDecoders->GetCount() - i - 1); |
- return TRUE; |
+ return true; |
} |
if (last_buf != src_buf) { |
FX_Free(last_buf); |
} |
if (offset == -1) { |
FX_Free(new_buf); |
- return FALSE; |
+ return false; |
} |
last_buf = new_buf; |
last_size = new_size; |
@@ -418,7 +418,7 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf, |
pImageParms = nullptr; |
dest_buf = last_buf; |
dest_size = last_size; |
- return TRUE; |
+ return true; |
} |
CFX_WideString PDF_DecodeText(const uint8_t* src_data, uint32_t src_len) { |
@@ -512,7 +512,7 @@ CFX_ByteString PDF_EncodeText(const CFX_WideString& str) { |
return PDF_EncodeText(str.c_str(), str.GetLength()); |
} |
-CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, FX_BOOL bHex) { |
+CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, bool bHex) { |
CFX_ByteTextBuf result; |
int srclen = src.GetLength(); |
if (bHex) { |
@@ -570,7 +570,7 @@ uint32_t FlateDecode(const uint8_t* src_buf, |
CCodec_ModuleMgr* pEncoders = CPDF_ModuleMgr::Get()->GetCodecModule(); |
if (pEncoders) { |
return pEncoders->GetFlateModule()->FlateOrLZWDecode( |
- FALSE, src_buf, src_size, FALSE, 0, 0, 0, 0, 0, dest_buf, dest_size); |
+ false, src_buf, src_size, false, 0, 0, 0, 0, 0, dest_buf, dest_size); |
} |
return 0; |
} |