Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

xfa/src/fxbarcode/oned/BC_OneDimWriter.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
 // Original code is licensed as follows:
 /*
  * Copyright 2011 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ skipping 181 matching lines @@
     rect.right -= 1;
   }
   matrix->TransformRect(rect);
   FX_RECT re = rect.GetOutterRect();
   device->FillRect(&re, m_backgroundColor);
   CFX_Matrix affine_matrix(1.0, 0.0, 0.0, -1.0, (FX_FLOAT)locX,
                            (FX_FLOAT)(locY + iFontSize));
   if (matrix != NULL) {
     affine_matrix.Concat(*matrix);
   }
-  device->DrawNormalText(
-      str.GetLength(), pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),
-      (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix, m_fontColor,
-      FXTEXT_CLEARTYPE);
+  device->DrawNormalText(str.GetLength(), pCharPos, m_pFont,
+                         CFX_GEModule::Get()->GetFontCache(),
+                         (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix,
+                         m_fontColor, FXTEXT_CLEARTYPE);
 }
 void CBC_OneDimWriter::ShowBitmapChars(CFX_DIBitmap* pOutBitmap,
                                        const CFX_ByteString str,
                                        FX_FLOAT geWidth,
                                        FXTEXT_CHARPOS* pCharPos,
                                        FX_FLOAT locX,
                                        FX_FLOAT locY,
                                        int32_t barWidth) {
   int32_t iFontSize = (int32_t)fabs(m_fFontSize);
   int32_t iTextHeight = iFontSize + 1;
   CFX_FxgeDevice ge;
   ge.Create((int)geWidth, iTextHeight, m_colorSpace);
   FX_RECT geRect(0, 0, (int)geWidth, iTextHeight);
   ge.FillRect(&geRect, m_backgroundColor);
-  CFX_AffineMatrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);
-  ge.DrawNormalText(
-      str.GetLength(), pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),
-      (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix, m_fontColor,
-      FXTEXT_CLEARTYPE);
+  CFX_Matrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);
+  ge.DrawNormalText(str.GetLength(), pCharPos, m_pFont,
+                    CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,
+                    (CFX_Matrix*)&affine_matrix, m_fontColor, FXTEXT_CLEARTYPE);
   CFX_FxgeDevice geBitmap;
   geBitmap.Attach(pOutBitmap);
   geBitmap.SetDIBits(ge.GetBitmap(), (int)locX, (int)locY);
 }
 void CBC_OneDimWriter::ShowChars(const CFX_WideStringC& contents,
                                  CFX_DIBitmap* pOutBitmap,
                                  CFX_RenderDevice* device,
                                  const CFX_Matrix* matrix,
                                  int32_t barWidth,
                                  int32_t multiple,
@@ skipping 199 matching lines @@
       if (outputX + m_multiple > outputWidth && outputWidth - outputX > 0) {
         m_output->SetRegion(outputX, 0, outputWidth - outputX, outputHeight, e);
         break;
       }
       m_output->SetRegion(outputX, 0, m_multiple, outputHeight, e);
       BC_EXCEPTION_CHECK_ReturnVoid(e);
     }
     outputX += m_multiple;
   }
 }