1 files changed, 29 insertions, 33 deletions

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
index dbd5f311a6..5fbdcc634c 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
@@ -231,12 +231,12 @@ ICodec_ScanlineDecoder* FPDFAPI_CreateFaxDecoder(
   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"));
+    K = pParams->GetInteger("K");
+    EndOfLine = pParams->GetInteger("EndOfLine");
+    ByteAlign = pParams->GetInteger("EncodedByteAlign");
+    BlackIs1 = pParams->GetInteger("BlackIs1");
+    Columns = pParams->GetInteger("Columns", 1728);
+    Rows = pParams->GetInteger("Rows");
     if (Rows > USHRT_MAX) {
       Rows = 0;
     }
@@ -280,10 +280,10 @@ ICodec_ScanlineDecoder* FPDFAPI_CreateFlateDecoder(
   int predictor = 0;
   int Colors = 0, BitsPerComponent = 0, Columns = 0;
   if (pParams) {
-    predictor = 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);
+    predictor = pParams->GetInteger("Predictor");
+    Colors = pParams->GetInteger("Colors", 1);
+    BitsPerComponent = pParams->GetInteger("BitsPerComponent", 8);
+    Columns = pParams->GetInteger("Columns", 1);
     if (!CheckFlateDecodeParams(Colors, BitsPerComponent, Columns)) {
       return NULL;
     }
@@ -303,11 +303,11 @@ FX_DWORD FPDFAPI_FlateOrLZWDecode(FX_BOOL bLZW,
   FX_BOOL bEarlyChange = TRUE;
   int Colors = 0, BitsPerComponent = 0, Columns = 0;
   if (pParams) {
-    predictor = pParams->GetInteger(FX_BSTRC("Predictor"));
-    bEarlyChange = 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);
+    predictor = pParams->GetInteger("Predictor");
+    bEarlyChange = pParams->GetInteger("EarlyChange", 1);
+    Colors = pParams->GetInteger("Colors", 1);
+    BitsPerComponent = pParams->GetInteger("BitsPerComponent", 8);
+    Columns = pParams->GetInteger("Columns", 1);
     if (!CheckFlateDecodeParams(Colors, BitsPerComponent, Columns)) {
       return (FX_DWORD)-1;
     }
@@ -327,13 +327,12 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf,
                        FX_BOOL bImageAcc)
 
 {
-  CPDF_Object* pDecoder =
-      pDict ? pDict->GetElementValue(FX_BSTRC("Filter")) : nullptr;
+  CPDF_Object* pDecoder = pDict ? pDict->GetElementValue("Filter") : nullptr;
   if (!pDecoder || (!pDecoder->IsArray() && !pDecoder->IsName()))
     return FALSE;
 
   CPDF_Object* pParams =
-      pDict ? pDict->GetElementValue(FX_BSTRC("DecodeParms")) : nullptr;
+      pDict ? pDict->GetElementValue("DecodeParms") : nullptr;
   CFX_ByteStringArray DecoderList;
   CFX_ArrayTemplate<CPDF_Object*> ParamList;
   if (CPDF_Array* pDecoders = pDecoder->AsArray()) {
@@ -361,9 +360,9 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf,
     uint8_t* new_buf = nullptr;
     FX_DWORD new_size = (FX_DWORD)-1;
     int offset = -1;
-    if (decoder == FX_BSTRC("FlateDecode") || decoder == FX_BSTRC("Fl")) {
+    if (decoder == "FlateDecode" || decoder == "Fl") {
       if (bImageAcc && i == DecoderList.GetSize() - 1) {
-        ImageEncoding = FX_BSTRC("FlateDecode");
+        ImageEncoding = "FlateDecode";
         dest_buf = (uint8_t*)last_buf;
         dest_size = last_size;
         pImageParms = pParam;
@@ -371,32 +370,29 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf,
       }
       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")) {
+    } else if (decoder == "LZWDecode" || decoder == "LZW") {
       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")) {
+    } else if (decoder == "ASCII85Decode" || decoder == "A85") {
       offset = A85Decode(last_buf, last_size, new_buf, new_size);
-    } else if (decoder == FX_BSTRC("ASCIIHexDecode") ||
-               decoder == FX_BSTRC("AHx")) {
+    } else if (decoder == "ASCIIHexDecode" || decoder == "AHx") {
       offset = HexDecode(last_buf, last_size, new_buf, new_size);
-    } else if (decoder == FX_BSTRC("RunLengthDecode") ||
-               decoder == FX_BSTRC("RL")) {
+    } else if (decoder == "RunLengthDecode" || decoder == "RL") {
       if (bImageAcc && i == DecoderList.GetSize() - 1) {
-        ImageEncoding = FX_BSTRC("RunLengthDecode");
+        ImageEncoding = "RunLengthDecode";
         dest_buf = (uint8_t*)last_buf;
         dest_size = last_size;
         pImageParms = pParam;
         return TRUE;
       }
       offset = RunLengthDecode(last_buf, last_size, new_buf, new_size);
-    } else if (decoder == FX_BSTRC("Crypt")) {
+    } else if (decoder == "Crypt") {
       continue;
     } else {
       // If we get here, assume it's an image decoder.
-      if (decoder == FX_BSTRC("DCT")) {
+      if (decoder == "DCT") {
         decoder = "DCTDecode";
-      } else if (decoder == FX_BSTRC("CCF")) {
+      } else if (decoder == "CCF") {
         decoder = "CCITTFaxDecode";
       }
       ImageEncoding = decoder;
@@ -533,10 +529,10 @@ CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, FX_BOOL bHex) {
     if (ch == ')' || ch == '\\' || ch == '(') {
       result.AppendChar('\\');
     } else if (ch == 0x0a) {
-      result << FX_BSTRC("\\n");
+      result << "\\n";
       continue;
     } else if (ch == 0x0d) {
-      result << FX_BSTRC("\\r");
+      result << "\\r";
       continue;
     }
     result.AppendChar(ch);