Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/dib/fx_dib_transform.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 "dib_int.h"
 
 #include "core/include/fxge/fx_dib.h"
 
@@ skipping 134 matching lines @@
     -15, -15, -15, -14, -14, -14, -13, -13, -13, -12, -12, -12, -11, -11, -11,
     -10, -10, -10, -9,  -9,  -9,  -9,  -8,  -8,  -8,  -7,  -7,  -7,  -7,  -6,
     -6,  -6,  -6,  -5,  -5,  -5,  -5,  -4,  -4,  -4,  -4,  -3,  -3,  -3,  -3,
     -3,  -2,  -2,  -2,  -2,  -2,  -1,  -1,  -1,  -1,  -1,  -1,  0,   0,   0,
     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
     0,   0,   0,
 };
 
 class CFX_BilinearMatrix : public CPDF_FixedMatrix {
  public:
-  CFX_BilinearMatrix(const CFX_AffineMatrix& src, int bits)
+  CFX_BilinearMatrix(const CFX_Matrix& src, int bits)
       : CPDF_FixedMatrix(src, bits) {}
   inline void Transform(int x,
                         int y,
                         int& x1,
                         int& y1,
                         int& res_x,
                         int& res_y) {
     x1 = a * x + c * y + e + base / 2;
     y1 = b * x + d * y + f + base / 2;
     res_x = x1 % base;
@@ skipping 123 matching lines @@
   if (bFlipX) {
     rect.top = width - clip.left;
     rect.bottom = width - clip.right;
   } else {
     rect.top = clip.left;
     rect.bottom = clip.right;
   }
   rect.Normalize();
   return rect;
 }
-CFX_DIBitmap* CFX_DIBSource::TransformTo(const CFX_AffineMatrix* pDestMatrix,
+CFX_DIBitmap* CFX_DIBSource::TransformTo(const CFX_Matrix* pDestMatrix,
                                          int& result_left,
                                          int& result_top,
                                          FX_DWORD flags,
                                          const FX_RECT* pDestClip) const {
   CFX_ImageTransformer transformer;
   transformer.Start(this, pDestMatrix, flags, pDestClip);
   transformer.Continue(NULL);
   result_left = transformer.m_ResultLeft;
   result_top = transformer.m_ResultTop;
   CFX_DIBitmap* pTransformed = transformer.m_Storer.Detach();
@@ skipping 20 matching lines @@
     stretcher.Continue(NULL);
   }
   return storer.Detach();
 }
 CFX_ImageTransformer::CFX_ImageTransformer() {
   m_Status = 0;
   m_pMatrix = NULL;
 }
 CFX_ImageTransformer::~CFX_ImageTransformer() {}
 FX_BOOL CFX_ImageTransformer::Start(const CFX_DIBSource* pSrc,
-                                    const CFX_AffineMatrix* pDestMatrix,
+                                    const CFX_Matrix* pDestMatrix,
                                     int flags,
                                     const FX_RECT* pDestClip) {
-  m_pMatrix = (CFX_AffineMatrix*)pDestMatrix;
+  m_pMatrix = (CFX_Matrix*)pDestMatrix;
   CFX_FloatRect unit_rect = pDestMatrix->GetUnitRect();
   FX_RECT result_rect = unit_rect.GetClosestRect();
   FX_RECT result_clip = result_rect;
   if (pDestClip) {
     result_clip.Intersect(*pDestClip);
   }
   if (result_clip.IsEmpty()) {
     return FALSE;
   }
   m_ResultLeft = result_clip.left;
@@ skipping 23 matching lines @@
     result_clip.Offset(-result_rect.left, -result_rect.top);
     m_Stretcher.Start(&m_Storer, pSrc, dest_width, dest_height, result_clip,
                       flags);
     m_Status = 2;
     return TRUE;
   }
   int stretch_width =
       (int)FXSYS_ceil(FXSYS_sqrt2(pDestMatrix->a, pDestMatrix->b));
   int stretch_height =
       (int)FXSYS_ceil(FXSYS_sqrt2(pDestMatrix->c, pDestMatrix->d));
-  CFX_AffineMatrix stretch2dest(1.0f, 0.0f, 0.0f, -1.0f, 0.0f,
-                                (FX_FLOAT)(stretch_height));
+  CFX_Matrix stretch2dest(1.0f, 0.0f, 0.0f, -1.0f, 0.0f,
+                          (FX_FLOAT)(stretch_height));
   stretch2dest.Concat(
       pDestMatrix->a / stretch_width, pDestMatrix->b / stretch_width,
       pDestMatrix->c / stretch_height, pDestMatrix->d / stretch_height,
       pDestMatrix->e, pDestMatrix->f);
   m_dest2stretch.SetReverse(stretch2dest);
   CFX_FloatRect clip_rect_f(result_clip);
   clip_rect_f.Transform(&m_dest2stretch);
   m_StretchClip = clip_rect_f.GetOutterRect();
   m_StretchClip.Intersect(0, 0, stretch_width, stretch_height);
   m_Stretcher.Start(&m_Storer, pSrc, stretch_width, stretch_height,
@@ skipping 36 matching lines @@
   CFX_DIBitmap* pTransformed = new CFX_DIBitmap;
   FXDIB_Format transformF = GetTransformedFormat(m_Stretcher.m_pSource);
   if (!pTransformed->Create(m_ResultWidth, m_ResultHeight, transformF)) {
     delete pTransformed;
     return FALSE;
   }
   pTransformed->Clear(0);
   if (pTransformed->m_pAlphaMask) {
     pTransformed->m_pAlphaMask->Clear(0);
   }
-  CFX_AffineMatrix result2stretch(1.0f, 0.0f, 0.0f, 1.0f,
-                                  (FX_FLOAT)(m_ResultLeft),
-                                  (FX_FLOAT)(m_ResultTop));
+  CFX_Matrix result2stretch(1.0f, 0.0f, 0.0f, 1.0f, (FX_FLOAT)(m_ResultLeft),
+                            (FX_FLOAT)(m_ResultTop));
   result2stretch.Concat(m_dest2stretch);
   result2stretch.TranslateI(-m_StretchClip.left, -m_StretchClip.top);
   if (stretch_buf_mask == NULL && pTransformed->m_pAlphaMask) {
     pTransformed->m_pAlphaMask->Clear(0xff000000);
   } else if (pTransformed->m_pAlphaMask) {
     int stretch_pitch_mask = m_Storer.GetBitmap()->m_pAlphaMask->GetPitch();
     if (!(m_Flags & FXDIB_DOWNSAMPLE) && !(m_Flags & FXDIB_BICUBIC_INTERPOL)) {
       CFX_BilinearMatrix result2stretch_fix(result2stretch, 8);
       for (int row = 0; row < m_ResultHeight; row++) {
         uint8_t* dest_pos_mask =
@@ skipping 482 matching lines @@
             }
             dest_pos += destBpp;
           }
         }
       }
     }
   }
   m_Storer.Replace(pTransformed);
   return FALSE;
 }