Switch most min/max macros to std::min/max.

core/src/fpdftext/fpdf_text_int.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 <algorithm>
 #include <cctype>
 #include <cwctype>
 #include <memory>
@@ skipping 143 matching lines @@
     int nCount = m_charList.GetSize();
     if (nCount) {
       m_CharIndex.Add(0);
     }
     for (int i = 0; i < nCount; i++) {
       int indexSize = m_CharIndex.GetSize();
       FX_BOOL bNormal = FALSE;
       PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(i);
       if (charinfo.m_Flag == FPDFTEXT_CHAR_GENERATED) {
         bNormal = TRUE;
-      } else if (charinfo.m_Unicode == 0 || IsControlChar(charinfo))
+      } else if (charinfo.m_Unicode == 0 || IsControlChar(charinfo)) {
         bNormal = FALSE;
-      else {
+      } else {
         bNormal = TRUE;
       }
       if (bNormal) {
         if (indexSize % 2) {
           m_CharIndex.Add(1);
         } else {
           if (indexSize <= 0) {
             continue;
           }
           m_CharIndex.SetAt(indexSize - 1,
@@ skipping 1623 matching lines @@
     PAGECHAR_INFO preChar;
     if (size) {
       preChar = (PAGECHAR_INFO)m_TempCharList[size - 1];
     } else {
       size = m_charList.GetSize();
       if (size == 0) {
         return FALSE;
       }
       preChar = (PAGECHAR_INFO)m_charList[size - 1];
     }
-    if (FPDFTEXT_CHAR_PIECE == preChar.m_Flag)
-      if (0xAD == preChar.m_Unicode || 0x2D == preChar.m_Unicode) {
-        return TRUE;
-      }
+    if (FPDFTEXT_CHAR_PIECE == preChar.m_Flag &&
+        (0xAD == preChar.m_Unicode || 0x2D == preChar.m_Unicode)) {
+      return TRUE;
+    }
   }
   return FALSE;
 }
 int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj,
                                        const CFX_Matrix& formMatrix) {
   FindPreviousTextObject();
   FX_BOOL bNewline = FALSE;
   int WritingMode = GetTextObjectWritingMode(pObj);
   if (WritingMode == -1) {
     WritingMode = GetTextObjectWritingMode(m_pPreTextObj);
@@ skipping 89 matching lines @@
             CFX_FloatRect re(0, pObj->m_Bottom, 1000, pObj->m_Top);
             if (re.Contains(m_pPreTextObj->GetPosX(),
                             m_pPreTextObj->GetPosY())) {
               bNewline = FALSE;
             }
           }
         }
       }
     }
   }
-  if (bNewline) {
-    if (IsHyphen(curChar)) {
-      return 3;
-    }
-    return 2;
+  if (bNewline)
+    return IsHyphen(curChar) ? 3 : 2;
+
+  int32_t nChars = pObj->CountChars();
+  if (nChars == 1 && (0x2D == curChar || 0xAD == curChar) &&
+      IsHyphen(curChar)) {
+    return 3;
   }
-  int32_t nChars = pObj->CountChars();
-  if (nChars == 1 && (0x2D == curChar || 0xAD == curChar))
-    if (IsHyphen(curChar)) {
-      return 3;
-    }
   CFX_WideString PrevStr =
       m_pPreTextObj->GetFont()->UnicodeFromCharCode(PrevItem.m_CharCode);
   FX_WCHAR preChar = PrevStr.GetAt(PrevStr.GetLength() - 1);
   CFX_Matrix matrix;
   pObj->GetTextMatrix(&matrix);
   matrix.Concat(formMatrix);
   threshold = (FX_FLOAT)(nLastWidth > nThisWidth ? nLastWidth : nThisWidth);
   threshold = threshold > 400
                   ? (threshold < 700
                          ? threshold / 4
                          : (threshold > 800 ? threshold / 6 : threshold / 5))
                   : (threshold / 2);
   if (nLastWidth >= nThisWidth) {
     threshold *= FXSYS_fabs(m_pPreTextObj->GetFontSize());
   } else {
     threshold *= FXSYS_fabs(pObj->GetFontSize());
     threshold = matrix.TransformDistance(threshold);
     threshold = prev_reverse.TransformDistance(threshold);
   }
   threshold /= 1000;
   if ((threshold < 1.4881 && threshold > 1.4879) ||
       (threshold < 1.39001 && threshold > 1.38999)) {
     threshold *= 1.5;
   }
   if (FXSYS_fabs(last_pos + last_width - x) > threshold && curChar != L' ' &&
-      preChar != L' ')
+      preChar != L' ') {
     if (curChar != L' ' && preChar != L' ') {
       if ((x - last_pos - last_width) > threshold ||
           (last_pos - x - last_width) > threshold) {
         return 1;
       }
       if (x < 0 && (last_pos - x - last_width) > threshold) {
         return 1;
       }
       if ((x - last_pos - last_width) > this_width ||
           (x - last_pos - this_width) > last_width) {
         return 1;
       }
     }
+  }
   return 0;
 }
 FX_BOOL CPDF_TextPage::IsSameTextObject(CPDF_TextObject* pTextObj1,
                                         CPDF_TextObject* pTextObj2) {
   if (!pTextObj1 || !pTextObj2) {
     return FALSE;
   }
   CFX_FloatRect rcPreObj(pTextObj2->m_Left, pTextObj2->m_Bottom,
                          pTextObj2->m_Right, pTextObj2->m_Top);
   CFX_FloatRect rcCurObj(pTextObj1->m_Left, pTextObj1->m_Bottom,
@@ skipping 33 matching lines @@
     pTextObj2->GetItemInfo(i, &itemPer);
     pTextObj1->GetItemInfo(i, &itemCur);
     if (itemCur.m_CharCode != itemPer.m_CharCode) {
       return FALSE;
     }
   }
   if (FXSYS_fabs(pTextObj1->GetPosX() - pTextObj2->GetPosX()) >
           GetCharWidth(itemPer.m_CharCode, pTextObj2->GetFont()) *
               pTextObj2->GetFontSize() / 1000 * 0.9 ||
       FXSYS_fabs(pTextObj1->GetPosY() - pTextObj2->GetPosY()) >
-          FX_MAX(FX_MAX(rcPreObj.Height(), rcPreObj.Width()),
-                 pTextObj2->GetFontSize()) /
+          std::max(std::max(rcPreObj.Height(), rcPreObj.Width()),
+                   pTextObj2->GetFontSize()) /
               8) {
     return FALSE;
   }
   return TRUE;
 }
 FX_BOOL CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj,
                                              FX_POSITION ObjPos) {
   if (!pTextObj) {
     return FALSE;
   }
@@ skipping 678 matching lines @@
   if (!m_bIsParsed || index < 0 || index >= m_LinkList.GetSize()) {
     return;
   }
   CPDF_LinkExt* link = NULL;
   link = m_LinkList.GetAt(index);
   if (!link) {
     return;
   }
   m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }