FX Bool considered harmful, part 3

core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fpdfapi/fpdf_parser.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include <limits.h>
@@ skipping 73 matching lines @@
 }
 FX_DWORD _HexDecode(const uint8_t* src_buf, FX_DWORD src_size, uint8_t*& dest_buf, FX_DWORD& dest_size)
 {
     FX_DWORD i;
     for (i = 0; i < src_size; i ++)
         if (src_buf[i] == '>') {
             break;
         }
     dest_buf = FX_Alloc( uint8_t, i / 2 + 1);
     dest_size = 0;
-    FX_BOOL bFirstDigit = TRUE;
+    bool bFirstDigit = true;
     for (i = 0; i < src_size; i ++) {
         uint8_t ch = src_buf[i];
         if (ch == ' ' || ch == '\n' || ch == '\t' || ch == '\r') {
             continue;
         }
         int digit;
         if (ch <= '9' && ch >= '0') {
             digit = ch - '0';
         } else if (ch <= 'f' && ch >= 'a') {
             digit = ch - 'a' + 10;
@@ skipping 74 matching lines @@
     FX_DWORD ret = i + 1;
     if (ret > src_size) {
         ret = src_size;
     }
     return ret;
 }
 ICodec_ScanlineDecoder* FPDFAPI_CreateFaxDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height,
         const CPDF_Dictionary* pParams)
 {
     int K = 0;
-    FX_BOOL EndOfLine = FALSE;
-    FX_BOOL ByteAlign = FALSE;
-    FX_BOOL BlackIs1 = FALSE;
+    bool EndOfLine = false;
+    bool ByteAlign = false;
+    bool BlackIs1 = false;
     int Columns = 1728;
     int Rows = 0;
     if (pParams) {
         K = pParams->GetInteger(FX_BSTRC("K"));
         EndOfLine = pParams->GetInteger(FX_BSTRC("EndOfLine"));
         ByteAlign = pParams->GetInteger(FX_BSTRC("EncodedByteAlign"));
         BlackIs1 = pParams->GetInteger(FX_BSTRC("BlackIs1"));
         Columns = pParams->GetInteger(FX_BSTRC("Columns"), 1728);
         Rows = pParams->GetInteger(FX_BSTRC("Rows"));
         if (Rows > USHRT_MAX) {
             Rows = 0;
         }
         if (Columns <= 0 || Rows < 0 || Columns > USHRT_MAX || Rows > USHRT_MAX) {
             return NULL;
         }
     }
     return CPDF_ModuleMgr::Get()->GetFaxModule()->CreateDecoder(src_buf, src_size, width, height,
             K, EndOfLine, ByteAlign, BlackIs1, Columns, Rows);
 }
-static FX_BOOL CheckFlateDecodeParams(int Colors, int BitsPerComponent, int Columns)
+static bool CheckFlateDecodeParams(int Colors, int BitsPerComponent, int Columns)
 {
     if (Columns < 0) {
-        return FALSE;
+        return false;
     }
     int check = Columns;
     if (Colors < 0 || (check > 0 && Colors > INT_MAX / check)) {
-        return FALSE;
+        return false;
     }
     check *= Colors;
     if (BitsPerComponent < 0 ||
             (check > 0 && BitsPerComponent > INT_MAX / check)) {
-        return FALSE;
+        return false;
     }
     check *= BitsPerComponent;
     if (check > INT_MAX - 7) {
-        return FALSE;
+        return false;
     }
-    return TRUE;
+    return true;
 }
 ICodec_ScanlineDecoder* FPDFAPI_CreateFlateDecoder(const uint8_t* src_buf, FX_DWORD src_size, int width, int height,
         int nComps, int bpc, const CPDF_Dictionary* pParams)
 {
     int predictor = 0;
     int Colors = 0, BitsPerComponent = 0, Columns = 0;
     if (pParams) {
         predictor = ((CPDF_Dictionary*)pParams)->GetInteger(FX_BSTRC("Predictor"));
         Colors = pParams->GetInteger(FX_BSTRC("Colors"), 1);
         BitsPerComponent = pParams->GetInteger(FX_BSTRC("BitsPerComponent"), 8);
         Columns = pParams->GetInteger(FX_BSTRC("Columns"), 1);
         if (!CheckFlateDecodeParams(Colors, BitsPerComponent, Columns)) {
             return NULL;
         }
     }
     return CPDF_ModuleMgr::Get()->GetFlateModule()->CreateDecoder(src_buf, src_size, width, height,
             nComps, bpc, predictor, Colors, BitsPerComponent, Columns);
 }
-FX_DWORD FPDFAPI_FlateOrLZWDecode(FX_BOOL bLZW, const uint8_t* src_buf, FX_DWORD src_size, CPDF_Dictionary* pParams,
+FX_DWORD FPDFAPI_FlateOrLZWDecode(bool bLZW, const uint8_t* src_buf, FX_DWORD src_size, CPDF_Dictionary* pParams,
                                   FX_DWORD estimated_size, uint8_t*& dest_buf, FX_DWORD& dest_size)
 {
     int predictor = 0;
-    FX_BOOL bEarlyChange = TRUE;
+    bool bEarlyChange = true;
     int Colors = 0, BitsPerComponent = 0, Columns = 0;
     if (pParams) {
         predictor = ((CPDF_Dictionary*)pParams)->GetInteger(FX_BSTRC("Predictor"));
         bEarlyChange = ((CPDF_Dictionary*)pParams)->GetInteger(FX_BSTRC("EarlyChange"), 1);
         Colors = pParams->GetInteger(FX_BSTRC("Colors"), 1);
         BitsPerComponent = pParams->GetInteger(FX_BSTRC("BitsPerComponent"), 8);
         Columns = pParams->GetInteger(FX_BSTRC("Columns"), 1);
         if (!CheckFlateDecodeParams(Colors, BitsPerComponent, Columns)) {
             return (FX_DWORD) - 1;
         }
     }
     return CPDF_ModuleMgr::Get()->GetFlateModule()->FlateOrLZWDecode(bLZW, src_buf, src_size,
             bEarlyChange, predictor, Colors, BitsPerComponent, Columns, estimated_size,
             dest_buf, dest_size);
 }
-FX_BOOL PDF_DataDecode(const uint8_t* src_buf, FX_DWORD src_size, const CPDF_Dictionary* pDict,
+bool PDF_DataDecode(const uint8_t* src_buf, FX_DWORD src_size, const CPDF_Dictionary* pDict,
                        uint8_t*& dest_buf, FX_DWORD& dest_size, CFX_ByteString& ImageEncoding,
-                       CPDF_Dictionary*& pImageParms, FX_DWORD last_estimated_size, FX_BOOL bImageAcc)
+                       CPDF_Dictionary*& pImageParms, FX_DWORD last_estimated_size, bool bImageAcc)
 
 {
     CPDF_Object* pDecoder = pDict ? pDict->GetElementValue(FX_BSTRC("Filter")) : NULL;
     if (pDecoder == NULL || (pDecoder->GetType() != PDFOBJ_ARRAY && pDecoder->GetType() != PDFOBJ_NAME)) {
-        return FALSE;
+        return false;
     }
     CPDF_Object* pParams = pDict ? pDict->GetElementValue(FX_BSTRC("DecodeParms")) : NULL;
     CFX_ByteStringArray DecoderList;
     CFX_PtrArray ParamList;
     if (pDecoder->GetType() == PDFOBJ_ARRAY) {
         if (pParams && pParams->GetType() != PDFOBJ_ARRAY) {
             pParams = NULL;
         }
         CPDF_Array* pDecoders = (CPDF_Array*)pDecoder;
         for (FX_DWORD i = 0; i < pDecoders->GetCount(); i ++) {
@@ skipping 17 matching lines @@
         CPDF_Dictionary* pParam = (CPDF_Dictionary*)ParamList[i];
         uint8_t* new_buf = NULL;
         FX_DWORD new_size = (FX_DWORD) - 1;
         int offset = -1;
         if (decoder == FX_BSTRC("FlateDecode") || decoder == FX_BSTRC("Fl")) {
             if (bImageAcc && i == DecoderList.GetSize() - 1) {
                 ImageEncoding = FX_BSTRC("FlateDecode");
                 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, estimated_size, new_buf, new_size);
+            offset = FPDFAPI_FlateOrLZWDecode(false, last_buf, last_size, pParam, estimated_size, new_buf, new_size);
         } else if (decoder == FX_BSTRC("LZWDecode") || decoder == FX_BSTRC("LZW")) {
-            offset = FPDFAPI_FlateOrLZWDecode(TRUE, last_buf, last_size, pParam, estimated_size, new_buf, new_size);
+            offset = FPDFAPI_FlateOrLZWDecode(true, last_buf, last_size, pParam, estimated_size, new_buf, new_size);
         } else if (decoder == FX_BSTRC("ASCII85Decode") || decoder == FX_BSTRC("A85")) {
             offset = _A85Decode(last_buf, last_size, new_buf, new_size);
         } else if (decoder == FX_BSTRC("ASCIIHexDecode") || decoder == FX_BSTRC("AHx")) {
             offset = _HexDecode(last_buf, last_size, new_buf, new_size);
         } else if (decoder == FX_BSTRC("RunLengthDecode") || decoder == FX_BSTRC("RL")) {
             if (bImageAcc && i == DecoderList.GetSize() - 1) {
                 ImageEncoding = FX_BSTRC("RunLengthDecode");
                 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 == FX_BSTRC("DCT")) {
                 decoder = "DCTDecode";
             } else if (decoder == FX_BSTRC("CCF")) {
                 decoder = "CCITTFaxDecode";
             } else if (decoder == FX_BSTRC("Crypt")) {
                 continue;
             }
             ImageEncoding = decoder;
             pImageParms = pParam;
             dest_buf = (uint8_t*)last_buf;
             dest_size = last_size;
-            return TRUE;
+            return true;
         }
         if (last_buf != src_buf) {
             FX_Free(last_buf);
         }
         if (offset == -1) {
-            return FALSE;
+            return false;
         }
         last_buf = new_buf;
         last_size = new_size;
     }
     ImageEncoding = "";
     pImageParms = NULL;
     dest_buf = last_buf;
     dest_size = last_size;
-    return TRUE;
+    return true;
 }
 extern const FX_WORD PDFDocEncoding[256] = {
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009,
     0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0010, 0x0011, 0x0012, 0x0013,
     0x0014, 0x0015, 0x0016, 0x0017, 0x02d8, 0x02c7, 0x02c6, 0x02d9, 0x02dd, 0x02db,
     0x02da, 0x02dc, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
     0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0030, 0x0031,
     0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b,
     0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045,
     0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
@@ skipping 13 matching lines @@
     0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db,
     0x00dc, 0x00dd, 0x00de, 0x00df, 0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5,
     0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
     0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9,
     0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
 };
 CFX_WideString PDF_DecodeText(const uint8_t* src_data, FX_DWORD src_len, CFX_CharMap* pCharMap)
 {
     CFX_WideString result;
     if (src_len >= 2 && ((src_data[0] == 0xfe && src_data[1] == 0xff) || (src_data[0] == 0xff && src_data[1] == 0xfe))) {
-        FX_BOOL bBE = src_data[0] == 0xfe;
+        bool bBE = src_data[0] == 0xfe;
         FX_DWORD max_chars = (src_len - 2) / 2;
         if (!max_chars) {
             return result;
         }
         if (src_data[0] == 0xff) {
             bBE = !src_data[2];
         }
         FX_WCHAR* dest_buf = result.GetBuffer(max_chars);
         const uint8_t* uni_str = src_data + 2;
         int dest_pos = 0;
@@ skipping 62 matching lines @@
     dest_buf2[0] = 0xfe;
     dest_buf2[1] = 0xff;
     dest_buf2 += 2;
     for (int i = 0; i < len; i ++) {
         *dest_buf2++ = pString[i] >> 8;
         *dest_buf2++ = (uint8_t)pString[i];
     }
     result.ReleaseBuffer(encLen);
     return result;
 }
-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) {
         result.AppendChar('<');
         for (int i = 0; i < srclen; i ++) {
             result.AppendChar("0123456789ABCDEF"[src[i] / 16]);
             result.AppendChar("0123456789ABCDEF"[src[i] % 16]);
         }
         result.AppendChar('>');
@@ skipping 28 matching lines @@
 {
     CCodec_ModuleMgr* pEncoders = CPDF_ModuleMgr::Get()->GetCodecModule();
     if (pEncoders) {
         pEncoders->GetFlateModule()->Encode(src_buf, src_size, predictor, Colors, BitsPerComponent, Columns, dest_buf, dest_size);
     }
 }
 FX_DWORD FlateDecode(const uint8_t* src_buf, FX_DWORD src_size, uint8_t*& dest_buf, FX_DWORD& dest_size)
 {
     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);
+        return pEncoders->GetFlateModule()->FlateOrLZWDecode(false, src_buf, src_size, false, 0, 0, 0, 0, 0, dest_buf, dest_size);
     }
     return 0;
 }