Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/ge/fx_ge_ps.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 "core/include/fxge/fx_ge.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "text_int.h"
 
@@ skipping 72 matching lines @@
   } else {
     OUTPUT_PS("Q\n");
   }
   m_bColorSet = m_bGraphStateSet = FALSE;
   m_ClipBox = m_ClipBoxStack.GetAt(m_ClipBoxStack.GetSize() - 1);
   if (!bKeepSaved) {
     m_ClipBoxStack.RemoveAt(m_ClipBoxStack.GetSize() - 1);
   }
 }
 void CFX_PSRenderer::OutputPath(const CFX_PathData* pPathData,
-                                const CFX_AffineMatrix* pObject2Device) {
+                                const CFX_Matrix* pObject2Device) {
   int nPoints = pPathData->GetPointCount();
   CFX_ByteTextBuf buf;
   buf.EstimateSize(nPoints * 10);
   for (int i = 0; i < nPoints; i++) {
     uint8_t flag = pPathData->GetFlag(i);
     FX_FLOAT x = pPathData->GetPointX(i);
     FX_FLOAT y = pPathData->GetPointY(i);
     if (pObject2Device) {
       pObject2Device->Transform(x, y);
     }
@@ skipping 26 matching lines @@
           buf << FX_BSTRC(" c\n");
         }
         i += 2;
         break;
       }
     }
   }
   m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
 }
 void CFX_PSRenderer::SetClip_PathFill(const CFX_PathData* pPathData,
-                                      const CFX_AffineMatrix* pObject2Device,
+                                      const CFX_Matrix* pObject2Device,
                                       int fill_mode) {
   StartRendering();
   OutputPath(pPathData, pObject2Device);
   CFX_FloatRect rect = pPathData->GetBoundingBox();
   if (pObject2Device) {
     rect.Transform(pObject2Device);
   }
   m_ClipBox.Intersect(rect.GetOutterRect());
   if ((fill_mode & 3) == FXFILL_WINDING) {
     OUTPUT_PS("W n\n");
   } else {
     OUTPUT_PS("W* n\n");
   }
 }
 void CFX_PSRenderer::SetClip_PathStroke(const CFX_PathData* pPathData,
-                                        const CFX_AffineMatrix* pObject2Device,
+                                        const CFX_Matrix* pObject2Device,
                                         const CFX_GraphStateData* pGraphState) {
   StartRendering();
   SetGraphState(pGraphState);
   if (pObject2Device) {
     CFX_ByteTextBuf buf;
     buf << FX_BSTRC("mx Cm [") << pObject2Device->a << FX_BSTRC(" ")
         << pObject2Device->b << FX_BSTRC(" ") << pObject2Device->c
         << FX_BSTRC(" ") << pObject2Device->d << FX_BSTRC(" ")
         << pObject2Device->e << FX_BSTRC(" ") << pObject2Device->f
         << FX_BSTRC("]cm ");
     m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
   }
   OutputPath(pPathData, NULL);
   CFX_FloatRect rect = pPathData->GetBoundingBox(pGraphState->m_LineWidth,
                                                  pGraphState->m_MiterLimit);
   rect.Transform(pObject2Device);
   m_ClipBox.Intersect(rect.GetOutterRect());
   if (pObject2Device) {
     OUTPUT_PS("strokepath W n sm\n");
   } else {
     OUTPUT_PS("strokepath W n\n");
   }
 }
 FX_BOOL CFX_PSRenderer::DrawPath(const CFX_PathData* pPathData,
-                                 const CFX_AffineMatrix* pObject2Device,
+                                 const CFX_Matrix* pObject2Device,
                                  const CFX_GraphStateData* pGraphState,
                                  FX_DWORD fill_color,
                                  FX_DWORD stroke_color,
                                  int fill_mode,
                                  int alpha_flag,
                                  void* pIccTransform) {
   StartRendering();
   int fill_alpha = FXGETFLAG_COLORTYPE(alpha_flag)
                        ? FXGETFLAG_ALPHA_FILL(alpha_flag)
                        : FXARGB_A(fill_color);
@@ skipping 134 matching lines @@
     FX_Free(dest_buf);
   }
 }
 FX_BOOL CFX_PSRenderer::SetDIBits(const CFX_DIBSource* pSource,
                                   FX_DWORD color,
                                   int left,
                                   int top,
                                   int alpha_flag,
                                   void* pIccTransform) {
   StartRendering();
-  CFX_AffineMatrix matrix((FX_FLOAT)(pSource->GetWidth()), 0.0f, 0.0f,
-                          -(FX_FLOAT)(pSource->GetHeight()), (FX_FLOAT)(left),
-                          (FX_FLOAT)(top + pSource->GetHeight()));
+  CFX_Matrix matrix((FX_FLOAT)(pSource->GetWidth()), 0.0f, 0.0f,
+                    -(FX_FLOAT)(pSource->GetHeight()), (FX_FLOAT)(left),
+                    (FX_FLOAT)(top + pSource->GetHeight()));
   return DrawDIBits(pSource, color, &matrix, 0, alpha_flag, pIccTransform);
 }
 FX_BOOL CFX_PSRenderer::StretchDIBits(const CFX_DIBSource* pSource,
                                       FX_DWORD color,
                                       int dest_left,
                                       int dest_top,
                                       int dest_width,
                                       int dest_height,
                                       FX_DWORD flags,
                                       int alpha_flag,
                                       void* pIccTransform) {
   StartRendering();
-  CFX_AffineMatrix matrix((FX_FLOAT)(dest_width), 0.0f, 0.0f,
-                          (FX_FLOAT)(-dest_height), (FX_FLOAT)(dest_left),
-                          (FX_FLOAT)(dest_top + dest_height));
+  CFX_Matrix matrix((FX_FLOAT)(dest_width), 0.0f, 0.0f,
+                    (FX_FLOAT)(-dest_height), (FX_FLOAT)(dest_left),
+                    (FX_FLOAT)(dest_top + dest_height));
   return DrawDIBits(pSource, color, &matrix, flags, alpha_flag, pIccTransform);
 }
 FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
                                    FX_DWORD color,
-                                   const CFX_AffineMatrix* pMatrix,
+                                   const CFX_Matrix* pMatrix,
                                    FX_DWORD flags,
                                    int alpha_flag,
                                    void* pIccTransform) {
   StartRendering();
   if ((pMatrix->a == 0 && pMatrix->b == 0) ||
       (pMatrix->c == 0 && pMatrix->d == 0)) {
     return TRUE;
   }
   if (pSource->HasAlpha()) {
     return FALSE;
@@ skipping 231 matching lines @@
     pPSFont->m_Glyphs[ps_glyphindex].m_AdjustMatrix[0] =
         charpos.m_AdjustMatrix[0];
     pPSFont->m_Glyphs[ps_glyphindex].m_AdjustMatrix[1] =
         charpos.m_AdjustMatrix[1];
     pPSFont->m_Glyphs[ps_glyphindex].m_AdjustMatrix[2] =
         charpos.m_AdjustMatrix[2];
     pPSFont->m_Glyphs[ps_glyphindex].m_AdjustMatrix[3] =
         charpos.m_AdjustMatrix[3];
   }
   pPSFont->m_nGlyphs++;
-  CFX_AffineMatrix matrix;
+  CFX_Matrix matrix;
   if (charpos.m_bGlyphAdjust)
     matrix.Set(charpos.m_AdjustMatrix[0], charpos.m_AdjustMatrix[1],
                charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3], 0, 0);
   matrix.Concat(1.0f, 0, 0, 1.0f, 0, 0);
   const CFX_PathData* pPathData = pFaceCache->LoadGlyphPath(
       pFont, charpos.m_GlyphIndex, charpos.m_FontCharWidth);
   if (pPathData == NULL) {
     return;
   }
   CFX_PathData TransformedPath(*pPathData);
@@ skipping 29 matching lines @@
   buf << FX_BSTRC("f");
   buf << FX_BSTRC("}bind def end\n");
   buf << FX_BSTRC("/X") << ps_fontnum << FX_BSTRC(" Ff/Encoding get ")
       << ps_glyphindex << FX_BSTRC("/") << ps_glyphindex << FX_BSTRC(" put\n");
   m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
 }
 FX_BOOL CFX_PSRenderer::DrawText(int nChars,
                                  const FXTEXT_CHARPOS* pCharPos,
                                  CFX_Font* pFont,
                                  CFX_FontCache* pCache,
-                                 const CFX_AffineMatrix* pObject2Device,
+                                 const CFX_Matrix* pObject2Device,
                                  FX_FLOAT font_size,
                                  FX_DWORD color,
                                  int alpha_flag,
                                  void* pIccTransform) {
   StartRendering();
   int alpha = FXGETFLAG_COLORTYPE(alpha_flag) ? FXGETFLAG_ALPHA_FILL(alpha_flag)
                                               : FXARGB_A(color);
   if (alpha < 255) {
     return FALSE;
   }
@@ skipping 37 matching lines @@
   FX_DWORD dest_size;
   CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
   if (pEncoders &&
       pEncoders->GetBasicModule()->A85Encode(data, len, dest_buf, dest_size)) {
     m_pOutput->OutputPS((const FX_CHAR*)dest_buf, dest_size);
     FX_Free(dest_buf);
   } else {
     m_pOutput->OutputPS((const FX_CHAR*)data, len);
   }
 }