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

core/src/fpdfdoc/pdf_vt.h

 // 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
 
 #ifndef CORE_SRC_FPDFDOC_PDF_VT_H_
 #define CORE_SRC_FPDFDOC_PDF_VT_H_
 
 class CPVT_Size;
 class CPVT_FloatRect;
 struct CPVT_SectionInfo;
 struct CPVT_LineInfo;
 struct CPVT_WordInfo;
 class CLine;
 class CLines;
 class CSection;
 class CTypeset;
 class CPDF_EditContainer;
 class CPDF_VariableText;
 class CPDF_VariableText_Iterator;
 #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001)
 #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb)))
 #define IsFloatSmaller(fa, fb) ((fa) < (fb) && !IsFloatZero((fa) - (fb)))
-template <class T>
-T FPDF_MIN(const T& i, const T& j) {
-  return ((i < j) ? i : j);
-}
-template <class T>
-T FPDF_MAX(const T& i, const T& j) {
-  return ((i > j) ? i : j);
-}
+
 class CPVT_Size {
  public:
   CPVT_Size() : x(0.0f), y(0.0f) {}
   CPVT_Size(FX_FLOAT other_x, FX_FLOAT other_y) {
     x = other_x;
     y = other_y;
   }
   FX_FLOAT x, y;
 };
 class CPVT_FloatRect : public CFX_FloatRect {
  public:
   CPVT_FloatRect() { left = top = right = bottom = 0.0f; }
   CPVT_FloatRect(FX_FLOAT other_left,
                  FX_FLOAT other_top,
                  FX_FLOAT other_right,
                  FX_FLOAT other_bottom) {
     left = other_left;
     top = other_top;
     right = other_right;
     bottom = other_bottom;
   }
-  CPVT_FloatRect(const CPDF_Rect& rect) {
+  explicit CPVT_FloatRect(const CPDF_Rect& rect) {
     left = rect.left;
     top = rect.top;
     right = rect.right;
     bottom = rect.bottom;
   }
   void Default() { left = top = right = bottom = 0.0f; }
   FX_FLOAT Height() const {
     if (top > bottom)
       return top - bottom;
     return bottom - top;
@@ skipping 174 matching lines @@
   }
 
  private:
   CPVT_ArrayTemplate<CLine*> m_Lines;
   int32_t m_nTotal;
 };
 class CSection {
   friend class CTypeset;
 
  public:
-  CSection(CPDF_VariableText* pVT);
+  explicit CSection(CPDF_VariableText* pVT);
   virtual ~CSection();
   void ResetAll();
   void ResetLineArray();
   void ResetWordArray();
   void ResetLinePlace();
   CPVT_WordPlace AddWord(const CPVT_WordPlace& place,
                          const CPVT_WordInfo& wordinfo);
   CPVT_WordPlace AddLine(const CPVT_LineInfo& lineinfo);
   void ClearWords(const CPVT_WordRange& PlaceRange);
   void ClearWord(const CPVT_WordPlace& place);
@@ skipping 18 matching lines @@
 
  private:
   void ClearLeftWords(int32_t nWordIndex);
   void ClearRightWords(int32_t nWordIndex);
   void ClearMidWords(int32_t nBeginIndex, int32_t nEndIndex);
 
   CPDF_VariableText* m_pVT;
 };
 class CTypeset {
  public:
-  CTypeset(CSection* pSection);
+  explicit CTypeset(CSection* pSection);
   virtual ~CTypeset();
   CPVT_Size GetEditSize(FX_FLOAT fFontSize);
   CPVT_FloatRect Typeset();
   CPVT_FloatRect CharArray();
 
  private:
   void SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize);
   void OutputLines();
 
   CPVT_FloatRect m_rcRet;
   CPDF_VariableText* m_pVT;
   CSection* m_pSection;
 };
 class CPDF_EditContainer {
  public:
   CPDF_EditContainer() : m_rcPlate(0, 0, 0, 0), m_rcContent(0, 0, 0, 0) {}
   virtual ~CPDF_EditContainer() {}
   virtual void SetPlateRect(const CPDF_Rect& rect) { m_rcPlate = rect; }
   virtual const CPDF_Rect& GetPlateRect() const { return m_rcPlate; }
   virtual void SetContentRect(const CPVT_FloatRect& rect) {
     m_rcContent = rect;
-  };
+  }
   virtual CPDF_Rect GetContentRect() const { return m_rcContent; }
   FX_FLOAT GetPlateWidth() const { return m_rcPlate.right - m_rcPlate.left; }
   FX_FLOAT GetPlateHeight() const { return m_rcPlate.top - m_rcPlate.bottom; }
   CPVT_Size GetPlateSize() const {
     return CPVT_Size(GetPlateWidth(), GetPlateHeight());
-  };
+  }
   CPDF_Point GetBTPoint() const {
     return CPDF_Point(m_rcPlate.left, m_rcPlate.top);
-  };
+  }
   CPDF_Point GetETPoint() const {
     return CPDF_Point(m_rcPlate.right, m_rcPlate.bottom);
-  };
+  }
   inline CPDF_Point InToOut(const CPDF_Point& point) const {
     return CPDF_Point(point.x + GetBTPoint().x, GetBTPoint().y - point.y);
-  };
+  }
   inline CPDF_Point OutToIn(const CPDF_Point& point) const {
     return CPDF_Point(point.x - GetBTPoint().x, GetBTPoint().y - point.y);
-  };
+  }
   inline CPDF_Rect InToOut(const CPVT_FloatRect& rect) const {
     CPDF_Point ptLeftTop = InToOut(CPDF_Point(rect.left, rect.top));
     CPDF_Point ptRightBottom = InToOut(CPDF_Point(rect.right, rect.bottom));
     return CPDF_Rect(ptLeftTop.x, ptRightBottom.y, ptRightBottom.x,
                      ptLeftTop.y);
-  };
+  }
   inline CPVT_FloatRect OutToIn(const CPDF_Rect& rect) const {
     CPDF_Point ptLeftTop = OutToIn(CPDF_Point(rect.left, rect.top));
     CPDF_Point ptRightBottom = OutToIn(CPDF_Point(rect.right, rect.bottom));
     return CPVT_FloatRect(ptLeftTop.x, ptLeftTop.y, ptRightBottom.x,
                           ptRightBottom.y);
-  };
+  }
 
  private:
   CPDF_Rect m_rcPlate;
   CPVT_FloatRect m_rcContent;
 };
 
 class CPDF_VariableText : public IPDF_VariableText, private CPDF_EditContainer {
   friend class CTypeset;
   friend class CSection;
   friend class CPDF_VariableText_Iterator;
@@ skipping 181 matching lines @@
 
  private:
   FX_BOOL m_bInitial;
   FX_BOOL m_bRichText;
   IPDF_VariableText_Provider* m_pVTProvider;
   CPDF_VariableText_Iterator* m_pVTIterator;
 };
 
 class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator {
  public:
-  CPDF_VariableText_Iterator(CPDF_VariableText* pVT);
+  explicit CPDF_VariableText_Iterator(CPDF_VariableText* pVT);
   ~CPDF_VariableText_Iterator() override;
 
   // IPDF_VariableText_Iterator
   FX_BOOL NextWord() override;
   FX_BOOL PrevWord() override;
   FX_BOOL NextLine() override;
   FX_BOOL PrevLine() override;
   FX_BOOL NextSection() override;
   FX_BOOL PrevSection() override;
   FX_BOOL SetWord(const CPVT_Word& word) override;
   FX_BOOL GetWord(CPVT_Word& word) const override;
   FX_BOOL GetLine(CPVT_Line& line) const override;
   FX_BOOL GetSection(CPVT_Section& section) const override;
   FX_BOOL SetSection(const CPVT_Section& section) override;
   void SetAt(int32_t nWordIndex) override;
   void SetAt(const CPVT_WordPlace& place) override;
   const CPVT_WordPlace& GetAt() const override { return m_CurPos; }
 
  private:
   CPVT_WordPlace m_CurPos;
   CPDF_VariableText* m_pVT;
 };
 
 #endif  // CORE_SRC_FPDFDOC_PDF_VT_H_