Merge to XFA: FFL_MIN and FFL_MAX are pointless and stupid.

fpdfsdk/src/formfiller/FFL_Utils.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 "../../include/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_Utils.h"
 
 CPDF_Rect CFFL_Utils::MaxRect(const CPDF_Rect & rect1,const CPDF_Rect & rect2)
 {
         CPDF_Rect rcRet;
 
-        rcRet.left = FFL_MIN(rect1.left,rect2.left);
-        rcRet.bottom = FFL_MIN(rect1.bottom,rect2.bottom);
-        rcRet.right = FFL_MAX(rect1.right,rect2.right);
-        rcRet.top = FFL_MAX(rect1.top,rect2.top);
+        rcRet.left = std::min(rect1.left, rect2.left);
+        rcRet.bottom = std::min(rect1.bottom, rect2.bottom);
+        rcRet.right = std::max(rect1.right, rect2.right);
+        rcRet.top = std::max(rect1.top, rect2.top);
 
         return rcRet;
 }
 
 CPDF_Rect CFFL_Utils::InflateRect(const CPDF_Rect & crRect,const FX_FLOAT & fSize)
 {
         CPDF_Rect crNew(crRect.left - fSize,
                                         crRect.bottom - fSize,
                                         crRect.right + fSize,
                                         crRect.top + fSize);
         crNew.Normalize();
         return crNew;
 }
 
 CPDF_Rect CFFL_Utils::DeflateRect(const CPDF_Rect & crRect,const FX_FLOAT & fSize)
 {
         CPDF_Rect crNew(crRect.left + fSize,
                                         crRect.bottom + fSize,
                                         crRect.right - fSize,
                                         crRect.top - fSize);
         crNew.Normalize();
         return crNew;
 }
 
-/*
-FX_BOOL CFFL_Utils::RectContainsRect(const CPDF_Rect & father,const CPDF_Rect & son)
-{
-        return (father.left <= son.left && father.right >= son.right && 
-                                father.bottom <= son.bottom && father.top >= son.top);
-
-}
-
-FX_BOOL CFFL_Utils::RectContainsPoint(const CPDF_Rect & father,const CPDF_Point & son)
-{
-        return (father.left <= son.x && father.right >= son.x && 
-                                father.bottom <= son.y && father.top >= son.y);
-}
-
-FX_BOOL CFFL_Utils::RectContainsXY(const CPDF_Rect & father,FX_FLOAT x,FX_FLOAT y)
-{
-        return (father.left <= x && father.right >= x && 
-                                father.bottom <= y && father.top >= y);
-}
-*/
-
 FX_BOOL CFFL_Utils::TraceObject(CPDF_Object* pObj)
 {
         if (!pObj) return FALSE;
 
         FX_DWORD        dwObjNum = pObj->GetObjNum();
         switch (pObj->GetType())
         {
         case PDFOBJ_ARRAY:
                 {
                         CPDF_Array* pArray = (CPDF_Array*)pObj;
@@ skipping 51 matching lines @@
 //      case PDFOBJ_KEYWORD:
 //      case PDFOBJ_EOF:
         default:
                 break;
         }
         if (dwObjNum == 0) return FALSE;
 
         return TRUE;
 }