Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/fpdf_flatten.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 "public/fpdf_flatten.h"
 
 #include <algorithm>
 
 #include "fpdfsdk/include/fsdk_define.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
-typedef CFX_ArrayTemplate<CFX_FloatRect> CPDF_RectArray;
+typedef CFX_ArrayTemplate<CPDF_Rect> CPDF_RectArray;
 
 enum FPDF_TYPE { MAX, MIN };
 enum FPDF_VALUE { TOP, LEFT, RIGHT, BOTTOM };
 
-FX_BOOL IsValiableRect(CFX_FloatRect rect, CFX_FloatRect rcPage) {
+FX_BOOL IsValiableRect(CPDF_Rect rect, CPDF_Rect rcPage) {
   if (rect.left - rect.right > 0.000001f || rect.bottom - rect.top > 0.000001f)
     return FALSE;
 
   if (rect.left == 0.0f && rect.top == 0.0f && rect.right == 0.0f &&
       rect.bottom == 0.0f)
     return FALSE;
 
   if (!rcPage.IsEmpty()) {
     if (rect.left - rcPage.left < -10.000001f ||
         rect.right - rcPage.right > 10.000001f ||
         rect.top - rcPage.top > 10.000001f ||
         rect.bottom - rcPage.bottom < -10.000001f)
       return FALSE;
   }
 
   return TRUE;
 }
 
 void GetContentsRect(CPDF_Document* pDoc,
                      CPDF_Dictionary* pDict,
                      CPDF_RectArray* pRectArray) {
   std::unique_ptr<CPDF_Page> pPDFPage(new CPDF_Page);
   pPDFPage->Load(pDoc, pDict, FALSE);
   pPDFPage->ParseContent(nullptr);
 
   for (auto& pPageObject : *pPDFPage->GetPageObjectList()) {
     if (!pPageObject)
       continue;
 
-    CFX_FloatRect rc;
+    CPDF_Rect rc;
     rc.left = pPageObject->m_Left;
     rc.right = pPageObject->m_Right;
     rc.bottom = pPageObject->m_Bottom;
     rc.top = pPageObject->m_Top;
     if (IsValiableRect(rc, pDict->GetRectBy("MediaBox")))
       pRectArray->Add(rc);
   }
 }
 
 void ParserStream(CPDF_Dictionary* pPageDic,
                   CPDF_Dictionary* pStream,
                   CPDF_RectArray* pRectArray,
                   CPDF_ObjectArray* pObjectArray) {
   if (!pStream)
     return;
-  CFX_FloatRect rect;
+  CPDF_Rect rect;
   if (pStream->KeyExist("Rect"))
     rect = pStream->GetRectBy("Rect");
   else if (pStream->KeyExist("BBox"))
     rect = pStream->GetRectBy("BBox");
 
   if (IsValiableRect(rect, pPageDic->GetRectBy("MediaBox")))
     pRectArray->Add(rect);
 
   pObjectArray->Add(pStream);
 }
@@ skipping 44 matching lines @@
   int nRects = array.GetSize();
   FX_FLOAT fRet = 0.0f;
 
   if (nRects <= 0)
     return 0.0f;
 
   FX_FLOAT* pArray = new FX_FLOAT[nRects];
   switch (value) {
     case LEFT: {
       for (int i = 0; i < nRects; i++)
-        pArray[i] = CFX_FloatRect(array.GetAt(i)).left;
+        pArray[i] = CPDF_Rect(array.GetAt(i)).left;
 
       break;
     }
     case TOP: {
       for (int i = 0; i < nRects; i++)
-        pArray[i] = CFX_FloatRect(array.GetAt(i)).top;
+        pArray[i] = CPDF_Rect(array.GetAt(i)).top;
 
       break;
     }
     case RIGHT: {
       for (int i = 0; i < nRects; i++)
-        pArray[i] = CFX_FloatRect(array.GetAt(i)).right;
+        pArray[i] = CPDF_Rect(array.GetAt(i)).right;
 
       break;
     }
     case BOTTOM: {
       for (int i = 0; i < nRects; i++)
-        pArray[i] = CFX_FloatRect(array.GetAt(i)).bottom;
+        pArray[i] = CPDF_Rect(array.GetAt(i)).bottom;
 
       break;
     }
     default:
       break;
   }
   fRet = pArray[0];
   if (type == MAX) {
     for (int i = 1; i < nRects; i++)
       if (fRet <= pArray[i])
         fRet = pArray[i];
   } else {
     for (int i = 1; i < nRects; i++)
       if (fRet >= pArray[i])
         fRet = pArray[i];
   }
   delete[] pArray;
   return fRet;
 }
 
-CFX_FloatRect CalculateRect(CPDF_RectArray* pRectArray) {
-  CFX_FloatRect rcRet;
+CPDF_Rect CalculateRect(CPDF_RectArray* pRectArray) {
+  CPDF_Rect rcRet;
 
   rcRet.left = GetMinMaxValue(*pRectArray, MIN, LEFT);
   rcRet.top = GetMinMaxValue(*pRectArray, MAX, TOP);
   rcRet.right = GetMinMaxValue(*pRectArray, MAX, RIGHT);
   rcRet.bottom = GetMinMaxValue(*pRectArray, MIN, BOTTOM);
 
   return rcRet;
 }
 
 void SetPageContents(CFX_ByteString key,
@@ skipping 57 matching lines @@
     dwObjNum = pDocument->AddIndirectObject(pNewContents);
     pContentsArray->AddReference(pDocument, dwObjNum);
 
     CFX_ByteString sStream;
     sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
     pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                           FALSE);
   }
 }
 
-CFX_Matrix GetMatrix(CFX_FloatRect rcAnnot,
-                     CFX_FloatRect rcStream,
+CFX_Matrix GetMatrix(CPDF_Rect rcAnnot,
+                     CPDF_Rect rcStream,
                      const CFX_Matrix& matrix) {
   if (rcStream.IsEmpty())
     return CFX_Matrix();
 
   matrix.TransformRect(rcStream);
   rcStream.Normalize();
 
   FX_FLOAT a = rcAnnot.Width() / rcStream.Width();
   FX_FLOAT d = rcAnnot.Height() / rcStream.Height();
 
   FX_FLOAT e = rcAnnot.left - rcStream.left * a;
   FX_FLOAT f = rcAnnot.bottom - rcStream.bottom * d;
   return CFX_Matrix(a, 0, 0, d, e, f);
 }
 
 void GetOffset(FX_FLOAT& fa,
                FX_FLOAT& fd,
                FX_FLOAT& fe,
                FX_FLOAT& ff,
-               CFX_FloatRect rcAnnot,
-               CFX_FloatRect rcStream,
+               CPDF_Rect rcAnnot,
+               CPDF_Rect rcStream,
                const CFX_Matrix& matrix) {
   FX_FLOAT fStreamWidth = 0.0f;
   FX_FLOAT fStreamHeight = 0.0f;
 
   if (matrix.a != 0 && matrix.d != 0) {
     fStreamWidth = rcStream.right - rcStream.left;
     fStreamHeight = rcStream.top - rcStream.bottom;
   } else {
     fStreamWidth = rcStream.top - rcStream.bottom;
     fStreamHeight = rcStream.right - rcStream.left;
@@ skipping 35 matching lines @@
   }
 
   CPDF_ObjectArray ObjectArray;
   CPDF_RectArray RectArray;
 
   int iRet = FLATTEN_FAIL;
   iRet = ParserAnnots(pDocument, pPageDict, &RectArray, &ObjectArray, nFlag);
   if (iRet == FLATTEN_NOTHINGTODO || iRet == FLATTEN_FAIL)
     return iRet;
 
-  CFX_FloatRect rcOriginalCB;
-  CFX_FloatRect rcMerger = CalculateRect(&RectArray);
-  CFX_FloatRect rcOriginalMB = pPageDict->GetRectBy("MediaBox");
+  CPDF_Rect rcOriginalCB;
+  CPDF_Rect rcMerger = CalculateRect(&RectArray);
+  CPDF_Rect rcOriginalMB = pPageDict->GetRectBy("MediaBox");
 
   if (pPageDict->KeyExist("CropBox"))
     rcOriginalMB = pPageDict->GetRectBy("CropBox");
 
   if (rcOriginalMB.IsEmpty()) {
-    rcOriginalMB = CFX_FloatRect(0.0f, 0.0f, 612.0f, 792.0f);
+    rcOriginalMB = CPDF_Rect(0.0f, 0.0f, 612.0f, 792.0f);
   }
 
   rcMerger.left =
       rcMerger.left < rcOriginalMB.left ? rcOriginalMB.left : rcMerger.left;
   rcMerger.right =
       rcMerger.right > rcOriginalMB.right ? rcOriginalMB.right : rcMerger.right;
   rcMerger.top =
       rcMerger.top > rcOriginalMB.top ? rcOriginalMB.top : rcMerger.top;
   rcMerger.bottom = rcMerger.bottom < rcOriginalMB.bottom ? rcOriginalMB.bottom
                                                           : rcMerger.bottom;
@@ skipping 55 matching lines @@
 
   if (!key.IsEmpty()) {
     pPageXObject->SetAtReference(key, pDocument, dwObjNum);
     CPDF_Dictionary* pNewOXbjectDic = pNewXObject->GetDict();
     pNewXORes = new CPDF_Dictionary;
     pNewOXbjectDic->SetAt("Resources", pNewXORes);
     pNewOXbjectDic->SetAtName("Type", "XObject");
     pNewOXbjectDic->SetAtName("Subtype", "Form");
     pNewOXbjectDic->SetAtInteger("FormType", 1);
     pNewOXbjectDic->SetAtName("Name", "FRM");
-    CFX_FloatRect rcBBox = pPageDict->GetRectBy("ArtBox");
+    CPDF_Rect rcBBox = pPageDict->GetRectBy("ArtBox");
     pNewOXbjectDic->SetAtRect("BBox", rcBBox);
   }
 
   for (int i = 0; i < nStreams; i++) {
     CPDF_Dictionary* pAnnotDic = ObjectArray.GetAt(i);
     if (!pAnnotDic)
       continue;
 
-    CFX_FloatRect rcAnnot = pAnnotDic->GetRectBy("Rect");
+    CPDF_Rect rcAnnot = pAnnotDic->GetRectBy("Rect");
     rcAnnot.Normalize();
 
     CFX_ByteString sAnnotState = pAnnotDic->GetStringBy("AS");
     CPDF_Dictionary* pAnnotAP = pAnnotDic->GetDictBy("AP");
     if (!pAnnotAP)
       continue;
 
     CPDF_Stream* pAPStream = pAnnotAP->GetStreamBy("N");
     if (!pAPStream) {
       CPDF_Dictionary* pAPDic = pAnnotAP->GetDictBy("N");
@@ skipping 15 matching lines @@
           }
         }
       }
     }
     if (!pAPStream)
       continue;
 
     CPDF_Dictionary* pAPDic = pAPStream->GetDict();
     CFX_Matrix matrix = pAPDic->GetMatrixBy("Matrix");
 
-    CFX_FloatRect rcStream;
+    CPDF_Rect rcStream;
     if (pAPDic->KeyExist("Rect"))
       rcStream = pAPDic->GetRectBy("Rect");
     else if (pAPDic->KeyExist("BBox"))
       rcStream = pAPDic->GetRectBy("BBox");
 
     if (rcStream.IsEmpty())
       continue;
 
     CPDF_Object* pObj = pAPStream;
 
@@ skipping 40 matching lines @@
     pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
   }
   pPageDict->RemoveAt("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }