Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp

Issue 2055103002: remove redundant CFX_Matrix* cast in one-d barcode (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index f7900d4195477c0a3d3bcc80504da5c46fb728bf..4cf889ceef67e74218632a003c3bbb5658eb28bf 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);
}
« no previous file with comments | « xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698