Clean up misc nits found while fixing bugs.

core/src/fpdfapi/fpdf_page/fpdf_page_parser.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 "pageint.h"
+#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
 
-#define REQUIRE_PARAMS(count)  \
-  if (m_ParamCount != count) { \
-    return;                    \
+namespace {
+
+struct _FX_BSTR {
+  const FX_CHAR* m_Ptr;
+  int m_Size;
+};
+#define _FX_BSTRC(str) \
+  { str, sizeof(str) - 1 }
+
+struct PDF_AbbrPairs {
+  _FX_BSTR full_name;
+  _FX_BSTR abbr;
+};
+
+const PDF_AbbrPairs PDF_InlineKeyAbbr[] = {
+    {_FX_BSTRC("BitsPerComponent"), _FX_BSTRC("BPC")},
+    {_FX_BSTRC("ColorSpace"), _FX_BSTRC("CS")},
+    {_FX_BSTRC("Decode"), _FX_BSTRC("D")},
+    {_FX_BSTRC("DecodeParms"), _FX_BSTRC("DP")},
+    {_FX_BSTRC("Filter"), _FX_BSTRC("F")},
+    {_FX_BSTRC("Height"), _FX_BSTRC("H")},
+    {_FX_BSTRC("ImageMask"), _FX_BSTRC("IM")},
+    {_FX_BSTRC("Interpolate"), _FX_BSTRC("I")},
+    {_FX_BSTRC("Width"), _FX_BSTRC("W")},
+};
+
+const PDF_AbbrPairs PDF_InlineValueAbbr[] = {
+    {_FX_BSTRC("DeviceGray"), _FX_BSTRC("G")},
+    {_FX_BSTRC("DeviceRGB"), _FX_BSTRC("RGB")},
+    {_FX_BSTRC("DeviceCMYK"), _FX_BSTRC("CMYK")},
+    {_FX_BSTRC("Indexed"), _FX_BSTRC("I")},
+    {_FX_BSTRC("ASCIIHexDecode"), _FX_BSTRC("AHx")},
+    {_FX_BSTRC("ASCII85Decode"), _FX_BSTRC("A85")},
+    {_FX_BSTRC("LZWDecode"), _FX_BSTRC("LZW")},
+    {_FX_BSTRC("FlateDecode"), _FX_BSTRC("Fl")},
+    {_FX_BSTRC("RunLengthDecode"), _FX_BSTRC("RL")},
+    {_FX_BSTRC("CCITTFaxDecode"), _FX_BSTRC("CCF")},
+    {_FX_BSTRC("DCTDecode"), _FX_BSTRC("DCT")},
+};
+
+CFX_ByteStringC PDF_FindFullName(const PDF_AbbrPairs* table,
+                                 size_t count,
+                                 const CFX_ByteStringC& abbr) {
+  for (size_t i = 0; i < count; ++i) {
+    if (abbr.GetLength() != table[i].abbr.m_Size)
+      continue;
+    if (memcmp(abbr.GetPtr(), table[i].abbr.m_Ptr, abbr.GetLength()))
+      continue;
+    return CFX_ByteStringC(table[i].full_name.m_Ptr, table[i].full_name.m_Size);
   }
+  return CFX_ByteStringC();
+}
+
+CFX_ByteStringC PDF_FindAbbrName(const PDF_AbbrPairs* table,
+                                 size_t count,
+                                 const CFX_ByteStringC& name) {
+  for (size_t i = 0; i < count; ++i) {
+    if (name.GetLength() != table[i].full_name.m_Size)
+      continue;
+    if (memcmp(name.GetPtr(), table[i].full_name.m_Ptr, name.GetLength()))
+      continue;
+    return CFX_ByteStringC(table[i].abbr.m_Ptr, table[i].abbr.m_Size);
+  }
+  return CFX_ByteStringC();
+}
+
+}  // namespace
 
 CPDF_StreamContentParser::CPDF_StreamContentParser(
     CPDF_Document* pDocument,
     CPDF_Dictionary* pPageResources,
     CPDF_Dictionary* pParentResources,
     CFX_Matrix* pmtContentToUser,
     CPDF_PageObjects* pObjList,
     CPDF_Dictionary* pResources,
     CPDF_Rect* pBBox,
     CPDF_ParseOptions* pOptions,
@@ skipping 327 matching lines @@
 FX_BOOL CPDF_StreamContentParser::OnOperator(const FX_CHAR* op) {
   int i = 0;
   FX_DWORD opid = 0;
   while (i < 4 && op[i]) {
     opid = (opid << 8) + op[i];
     i++;
   }
   while (i < 4) {
     opid <<= 8;
     i++;
-  };
+  }
   int low = 0, high = sizeof g_OpCodes / sizeof(OpCode) - 1;
   while (low <= high) {
     int middle = (low + high) / 2;
     int compare = opid - g_OpCodes[middle].m_OpId;
     if (compare == 0) {
       (this->*g_OpCodes[middle].m_OpHandler)();
       return TRUE;
     }
     if (compare < 0) {
       high = middle - 1;
@@ skipping 49 matching lines @@
     m_CurContentMark.GetModify()->AddMark(tag, pDict, bDirect);
   }
 }
 void CPDF_StreamContentParser::Handle_BeginMarkedContent() {
   if (!m_Options.m_bMarkedContent) {
     return;
   }
   CFX_ByteString tag = GetString(0);
   m_CurContentMark.GetModify()->AddMark(tag, NULL, FALSE);
 }
-struct _FX_BSTR {
-  const FX_CHAR* m_Ptr;
-  int m_Size;
-};
-#define _FX_BSTRC(str) \
-  { str, sizeof(str) - 1 }
-const _FX_BSTR _PDF_InlineKeyAbbr[] = {
-    _FX_BSTRC("BitsPerComponent"),
-    _FX_BSTRC("BPC"),
-    _FX_BSTRC("ColorSpace"),
-    _FX_BSTRC("CS"),
-    _FX_BSTRC("Decode"),
-    _FX_BSTRC("D"),
-    _FX_BSTRC("DecodeParms"),
-    _FX_BSTRC("DP"),
-    _FX_BSTRC("Filter"),
-    _FX_BSTRC("F"),
-    _FX_BSTRC("Height"),
-    _FX_BSTRC("H"),
-    _FX_BSTRC("ImageMask"),
-    _FX_BSTRC("IM"),
-    _FX_BSTRC("Interpolate"),
-    _FX_BSTRC("I"),
-    _FX_BSTRC("Width"),
-    _FX_BSTRC("W"),
-};
-const _FX_BSTR _PDF_InlineValueAbbr[] = {
-    _FX_BSTRC("DeviceGray"),      _FX_BSTRC("G"),
-    _FX_BSTRC("DeviceRGB"),       _FX_BSTRC("RGB"),
-    _FX_BSTRC("DeviceCMYK"),      _FX_BSTRC("CMYK"),
-    _FX_BSTRC("Indexed"),         _FX_BSTRC("I"),
-    _FX_BSTRC("ASCIIHexDecode"),  _FX_BSTRC("AHx"),
-    _FX_BSTRC("ASCII85Decode"),   _FX_BSTRC("A85"),
-    _FX_BSTRC("LZWDecode"),       _FX_BSTRC("LZW"),
-    _FX_BSTRC("FlateDecode"),     _FX_BSTRC("Fl"),
-    _FX_BSTRC("RunLengthDecode"), _FX_BSTRC("RL"),
-    _FX_BSTRC("CCITTFaxDecode"),  _FX_BSTRC("CCF"),
-    _FX_BSTRC("DCTDecode"),       _FX_BSTRC("DCT"),
-};
-static CFX_ByteStringC _PDF_FindFullName(const _FX_BSTR* table,
-                                         int count,
-                                         const CFX_ByteStringC& abbr) {
-  int i = 0;
-  while (i < count) {
-    if (abbr.GetLength() == table[i + 1].m_Size &&
-        FXSYS_memcmp(abbr.GetPtr(), table[i + 1].m_Ptr, abbr.GetLength()) ==
-            0) {
-      return CFX_ByteStringC(table[i].m_Ptr, table[i].m_Size);
-    }
-    i += 2;
-  }
-  return CFX_ByteStringC();
-}
-void _PDF_ReplaceAbbr(CPDF_Object* pObj) {
+
+void PDF_ReplaceAbbr(CPDF_Object* pObj) {
   switch (pObj->GetType()) {
     case PDFOBJ_DICTIONARY: {
       CPDF_Dictionary* pDict = pObj->AsDictionary();
       FX_POSITION pos = pDict->GetStartPos();
       while (pos) {
         CFX_ByteString key;
         CPDF_Object* value = pDict->GetNextElement(pos, key);
-        CFX_ByteStringC fullname = _PDF_FindFullName(
-            _PDF_InlineKeyAbbr, sizeof _PDF_InlineKeyAbbr / sizeof(_FX_BSTR),
-            key);
+        CFX_ByteStringC fullname = PDF_FindFullName(
+            PDF_InlineKeyAbbr, FX_ArraySize(PDF_InlineKeyAbbr), key);
         if (!fullname.IsEmpty()) {
           pDict->ReplaceKey(key, fullname);
           key = fullname;
         }
 
         if (value->IsName()) {
           CFX_ByteString name = value->GetString();
-          fullname = _PDF_FindFullName(
-              _PDF_InlineValueAbbr,
-              sizeof _PDF_InlineValueAbbr / sizeof(_FX_BSTR), name);
+          fullname = PDF_FindFullName(PDF_InlineValueAbbr,
+                                      FX_ArraySize(PDF_InlineValueAbbr), name);
           if (!fullname.IsEmpty()) {
             pDict->SetAtName(key, fullname);
           }
         } else {
-          _PDF_ReplaceAbbr(value);
+          PDF_ReplaceAbbr(value);
         }
       }
       break;
     }
     case PDFOBJ_ARRAY: {
       CPDF_Array* pArray = pObj->AsArray();
       for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
         CPDF_Object* pElement = pArray->GetElement(i);
         if (pElement->IsName()) {
           CFX_ByteString name = pElement->GetString();
-          CFX_ByteStringC fullname = _PDF_FindFullName(
-              _PDF_InlineValueAbbr,
-              sizeof _PDF_InlineValueAbbr / sizeof(_FX_BSTR), name);
+          CFX_ByteStringC fullname = PDF_FindFullName(
+              PDF_InlineValueAbbr, FX_ArraySize(PDF_InlineValueAbbr), name);
           if (!fullname.IsEmpty()) {
             pArray->SetAt(i, new CPDF_Name(fullname));
           }
         } else {
-          _PDF_ReplaceAbbr(pElement);
+          PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
   }
 }
-static CFX_ByteStringC _PDF_FindAbbrName(const _FX_BSTR* table,
-                                         int count,
-                                         const CFX_ByteStringC& fullName) {
-  int i = 0;
-  while (i < count) {
-    if (fullName.GetLength() == table[i].m_Size &&
-        FXSYS_memcmp(fullName.GetPtr(), table[i].m_Ptr, fullName.GetLength()) ==
-            0) {
-      return CFX_ByteStringC(table[i + 1].m_Ptr, table[i + 1].m_Size);
-    }
-    i += 2;
-  }
-  return CFX_ByteStringC();
-}
-void _PDF_ReplaceFull(CPDF_Object* pObj) {
+
+void PDF_ReplaceFull(CPDF_Object* pObj) {
   switch (pObj->GetType()) {
     case PDFOBJ_DICTIONARY: {
       CPDF_Dictionary* pDict = pObj->AsDictionary();
       FX_POSITION pos = pDict->GetStartPos();
       while (pos) {
         CFX_ByteString key;
         CPDF_Object* value = pDict->GetNextElement(pos, key);
-        CFX_ByteStringC abbrName = _PDF_FindAbbrName(
-            _PDF_InlineKeyAbbr, sizeof(_PDF_InlineKeyAbbr) / sizeof(_FX_BSTR),
-            key);
+        CFX_ByteStringC abbrName = PDF_FindAbbrName(
+            PDF_InlineKeyAbbr, FX_ArraySize(PDF_InlineKeyAbbr), key);
         if (!abbrName.IsEmpty()) {
           pDict->ReplaceKey(key, abbrName);
           key = abbrName;
         }
         if (value->IsName()) {
           CFX_ByteString name = value->GetString();
-          abbrName = _PDF_FindAbbrName(
-              _PDF_InlineValueAbbr,
-              sizeof(_PDF_InlineValueAbbr) / sizeof(_FX_BSTR), name);
+          abbrName = PDF_FindAbbrName(PDF_InlineValueAbbr,
+                                      FX_ArraySize(PDF_InlineValueAbbr), name);
           if (!abbrName.IsEmpty()) {
             pDict->SetAtName(key, abbrName);
           }
         } else {
-          _PDF_ReplaceFull(value);
+          PDF_ReplaceFull(value);
         }
       }
       break;
     }
     case PDFOBJ_ARRAY: {
       CPDF_Array* pArray = pObj->AsArray();
       for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
         CPDF_Object* pElement = pArray->GetElement(i);
         if (pElement->IsName()) {
           CFX_ByteString name = pElement->GetString();
-          CFX_ByteStringC abbrName = _PDF_FindAbbrName(
-              _PDF_InlineValueAbbr,
-              sizeof _PDF_InlineValueAbbr / sizeof(_FX_BSTR), name);
+          CFX_ByteStringC abbrName = PDF_FindAbbrName(
+              PDF_InlineValueAbbr, FX_ArraySize(PDF_InlineValueAbbr), name);
           if (!abbrName.IsEmpty()) {
             pArray->SetAt(i, new CPDF_Name(abbrName));
           }
         } else {
-          _PDF_ReplaceFull(pElement);
+          PDF_ReplaceFull(pElement);
         }
       }
       break;
     }
   }
 }
 void CPDF_StreamContentParser::Handle_BeginText() {
   m_pCurStates->m_TextMatrix.Set(1.0f, 0, 0, 1.0f, 0, 0);
   OnChangeTextMatrix();
   m_pCurStates->m_TextX = 0;
@@ skipping 282 matching lines @@
 void CPDF_StreamContentParser::Handle_BeginImageData() {}
 void CPDF_StreamContentParser::Handle_SetLineJoin() {
   m_pCurStates->m_GraphState.GetModify()->m_LineJoin =
       (CFX_GraphStateData::LineJoin)GetInteger(0);
 }
 void CPDF_StreamContentParser::Handle_SetLineCap() {
   m_pCurStates->m_GraphState.GetModify()->m_LineCap =
       (CFX_GraphStateData::LineCap)GetInteger(0);
 }
 void CPDF_StreamContentParser::Handle_SetCMYKColor_Fill() {
-  REQUIRE_PARAMS(4);
+  if (m_ParamCount != 4)
+    return;
+
   FX_FLOAT values[4];
   for (int i = 0; i < 4; i++) {
     values[i] = GetNumber(3 - i);
   }
   CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK);
   m_pCurStates->m_ColorState.SetFillColor(pCS, values, 4);
 }
 void CPDF_StreamContentParser::Handle_SetCMYKColor_Stroke() {
-  REQUIRE_PARAMS(4);
+  if (m_ParamCount != 4)
+    return;
+
   FX_FLOAT values[4];
   for (int i = 0; i < 4; i++) {
     values[i] = GetNumber(3 - i);
   }
   CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK);
   m_pCurStates->m_ColorState.SetStrokeColor(pCS, values, 4);
 }
 void CPDF_StreamContentParser::Handle_LineTo() {
-  REQUIRE_PARAMS(2);
+  if (m_ParamCount != 2)
+    return;
+
   if (m_Options.m_bTextOnly) {
     return;
   }
   AddPathPoint(GetNumber(1), GetNumber(0), FXPT_LINETO);
 }
 void CPDF_StreamContentParser::Handle_MoveTo() {
-  REQUIRE_PARAMS(2);
+  if (m_ParamCount != 2)
+    return;
+
   if (m_Options.m_bTextOnly) {
     m_pSyntax->SkipPathObject();
     return;
   }
   AddPathPoint(GetNumber(1), GetNumber(0), FXPT_MOVETO);
   ParsePathObject();
 }
 void CPDF_StreamContentParser::Handle_SetMiterLimit() {
   m_pCurStates->m_GraphState.GetModify()->m_MiterLimit = GetNumber(0);
 }
@@ skipping 31 matching lines @@
                                            FX_FLOAT y,
                                            FX_FLOAT w,
                                            FX_FLOAT h) {
   AddPathPoint(x, y, FXPT_MOVETO);
   AddPathPoint(x + w, y, FXPT_LINETO);
   AddPathPoint(x + w, y + h, FXPT_LINETO);
   AddPathPoint(x, y + h, FXPT_LINETO);
   AddPathPoint(x, y, FXPT_LINETO | FXPT_CLOSEFIGURE);
 }
 void CPDF_StreamContentParser::Handle_SetRGBColor_Fill() {
-  REQUIRE_PARAMS(3);
+  if (m_ParamCount != 3)
+    return;
+
   FX_FLOAT values[3];
   for (int i = 0; i < 3; i++) {
     values[i] = GetNumber(2 - i);
   }
   CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB);
   m_pCurStates->m_ColorState.SetFillColor(pCS, values, 3);
 }
 void CPDF_StreamContentParser::Handle_SetRGBColor_Stroke() {
-  REQUIRE_PARAMS(3);
+  if (m_ParamCount != 3)
+    return;
+
   FX_FLOAT values[3];
   for (int i = 0; i < 3; i++) {
     values[i] = GetNumber(2 - i);
   }
   CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICERGB);
   m_pCurStates->m_ColorState.SetStrokeColor(pCS, values, 3);
 }
 void CPDF_StreamContentParser::Handle_SetRenderIntent() {}
 void CPDF_StreamContentParser::Handle_CloseStrokePath() {
   if (m_Options.m_bTextOnly) {
@@ skipping 341 matching lines @@
   for (int i = 0; i < n; i++) {
     if (pArray->GetElementValue(i)->IsString())
       nsegs++;
   }
   if (nsegs == 0) {
     for (int i = 0; i < n; i++) {
       m_pCurStates->m_TextX -=
           FXSYS_Mul(pArray->GetNumber(i),
                     m_pCurStates->m_TextState.GetFontSize()) /
           1000;
-    };
+    }
     return;
   }
   CFX_ByteString* pStrs = new CFX_ByteString[nsegs];
   FX_FLOAT* pKerning = FX_Alloc(FX_FLOAT, nsegs);
   int iSegment = 0;
   FX_FLOAT fInitKerning = 0;
   for (int i = 0; i < n; i++) {
     CPDF_Object* pObj = pArray->GetElementValue(i);
     if (pObj->IsString()) {
       CFX_ByteString str = pObj->GetString();
@@ skipping 165 matching lines @@
     m_pObjectList->m_ObjectList.AddTail(pPathObj);
   }
   if (PathClipType) {
     if (!matrix.IsIdentity()) {
       Path.Transform(&matrix);
       matrix.SetIdentity();
     }
     m_pCurStates->m_ClipPath.AppendPath(Path, PathClipType, TRUE);
   }
 }