Remove CFX_AffineMatrix/CPDF_Matrix

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 "fpdfsdk/include/fsdk_define.h"
 
@@ skipping 234 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_AffineMatrix GetMatrix(CPDF_Rect rcAnnot,
-                           CPDF_Rect rcStream,
-                           CFX_AffineMatrix matrix) {
+CFX_Matrix GetMatrix(CPDF_Rect rcAnnot, CPDF_Rect rcStream, CFX_Matrix matrix) {

[Lei Zhang, 2015/12/10 22:34:02]

const ref?

[Tom Sepez, 2015/12/10 22:48:41]

Ok.  There's a big CL one can cobble up to pass CFX_Matrix by const ref
everywhere ...

   if (rcStream.IsEmpty())
-    return CFX_AffineMatrix();
+    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_AffineMatrix(a, 0, 0, d, e, f);
+  return CFX_Matrix(a, 0, 0, d, e, f);
 }
 
 void GetOffset(FX_FLOAT& fa,
                FX_FLOAT& fd,
                FX_FLOAT& fe,
                FX_FLOAT& ff,
                CPDF_Rect rcAnnot,
                CPDF_Rect rcStream,
-               CFX_AffineMatrix matrix) {
+               CFX_Matrix matrix) {

[Tom Sepez, 2015/12/10 22:48:40]

here too.

   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 162 matching lines @@
               continue;
             pAPStream = pFirstObj->AsStream();
           }
         }
       }
     }
     if (!pAPStream)
       continue;
 
     CPDF_Dictionary* pAPDic = pAPStream->GetDict();
-    CFX_AffineMatrix matrix = pAPDic->GetMatrix("Matrix");
+    CFX_Matrix matrix = pAPDic->GetMatrix("Matrix");
 
     CPDF_Rect rcStream;
     if (pAPDic->KeyExist("Rect"))
       rcStream = pAPDic->GetRect("Rect");
     else if (pAPDic->KeyExist("BBox"))
       rcStream = pAPDic->GetRect("BBox");
 
     if (rcStream.IsEmpty())
       continue;
 
@@ skipping 27 matching lines @@
 
     if (matrix.IsIdentity()) {
       matrix.a = 1.0f;
       matrix.b = 0.0f;
       matrix.c = 0.0f;
       matrix.d = 1.0f;
       matrix.e = 0.0f;
       matrix.f = 0.0f;
     }
 
-    CFX_AffineMatrix m = GetMatrix(rcAnnot, rcStream, matrix);
+    CFX_Matrix m = GetMatrix(rcAnnot, rcStream, matrix);
     sTemp.Format("q %f 0 0 %f %f %f cm /%s Do Q\n", m.a, m.d, m.e, m.f,
                  sFormName.c_str());
     sStream += sTemp;
 
     pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
   }
   pPageDict->RemoveAt("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }