diff options
| author | tsepez <tsepez@chromium.org> | 2016-06-09 19:19:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-09 19:19:07 -0700 |
| commit | 855665d4889853f8ac71519de8ff004dba8eb056 (patch) | |
| tree | 1f8a6c90a6ec938e1ba73b4940236ff461a987e9 /xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp | |
| parent | 215507d8d612d4269723b49aaf28468b634f68ac (diff) | |
| download | pdfium-855665d4889853f8ac71519de8ff004dba8eb056.tar.xz | |
remove redundant CFX_Matrix* cast in one-d barcodechromium/2766chromium/2765
Review-Url: https://codereview.chromium.org/2055103002
Diffstat (limited to 'xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp')
| -rw-r--r-- | xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 19cb7ec6de..580e1a8444 100644 --- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -182,8 +182,7 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, ge.GetBitmap()->Clear(m_backgroundColor); ge.DrawNormalText(iLen, pCharPos + 1, m_pFont, CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, - (CFX_Matrix*)&affine_matrix, m_fontColor, - FXTEXT_CLEARTYPE); + &affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); geBitmap.SetDIBits(ge.GetBitmap(), leftPosition, m_Height - iTextHeight); } else { CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0, @@ -192,10 +191,9 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, if (matrix) { affine_matrix1.Concat(*matrix); } - device->DrawNormalText(iLen, pCharPos + 1, m_pFont, - CFX_GEModule::Get()->GetFontCache(), - (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1, - m_fontColor, FXTEXT_CLEARTYPE); + device->DrawNormalText( + iLen, pCharPos + 1, m_pFont, CFX_GEModule::Get()->GetFontCache(), + (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); } tempStr = str.Mid(6, 5); iLen = tempStr.GetLength(); @@ -205,8 +203,7 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, ge.FillRect(&rect2, m_backgroundColor); ge.DrawNormalText(iLen, pCharPos + 6, m_pFont, CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, - (CFX_Matrix*)&affine_matrix, m_fontColor, - FXTEXT_CLEARTYPE); + &affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 40 * multiple, m_Height - iTextHeight); } else { @@ -217,10 +214,9 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, if (matrix) { affine_matrix1.Concat(*matrix); } - device->DrawNormalText(iLen, pCharPos + 6, m_pFont, - CFX_GEModule::Get()->GetFontCache(), - (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1, - m_fontColor, FXTEXT_CLEARTYPE); + device->DrawNormalText( + iLen, pCharPos + 6, m_pFont, CFX_GEModule::Get()->GetFontCache(), + (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); } tempStr = str.Mid(0, 1); iLen = tempStr.GetLength(); @@ -235,8 +231,7 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, ge.GetBitmap()->Clear(m_backgroundColor); ge.DrawNormalText(iLen, pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, - (CFX_Matrix*)&affine_matrix, m_fontColor, - FXTEXT_CLEARTYPE); + &affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); geBitmap.SetDIBits(ge.GetBitmap(), 0, m_Height - iTextHeight); } else { CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0, 0, @@ -244,10 +239,9 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, if (matrix) { affine_matrix1.Concat(*matrix); } - device->DrawNormalText(iLen, pCharPos, m_pFont, - CFX_GEModule::Get()->GetFontCache(), - (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1, - m_fontColor, FXTEXT_CLEARTYPE); + device->DrawNormalText( + iLen, pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(), + (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); } tempStr = str.Mid(11, 1); iLen = tempStr.GetLength(); @@ -258,8 +252,7 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, ge.GetBitmap()->Clear(m_backgroundColor); ge.DrawNormalText(iLen, pCharPos + 11, m_pFont, CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize, - (CFX_Matrix*)&affine_matrix, m_fontColor, - FXTEXT_CLEARTYPE); + &affine_matrix, m_fontColor, FXTEXT_CLEARTYPE); geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 85 * multiple, m_Height - iTextHeight); } else { @@ -270,10 +263,9 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents, if (matrix) { affine_matrix1.Concat(*matrix); } - device->DrawNormalText(iLen, pCharPos + 11, m_pFont, - CFX_GEModule::Get()->GetFontCache(), - (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1, - m_fontColor, FXTEXT_CLEARTYPE); + device->DrawNormalText( + iLen, pCharPos + 11, m_pFont, CFX_GEModule::Get()->GetFontCache(), + (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); } FX_Free(pCharPos); } |