Index: xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp |
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp |
index 2aa57d18d1b29ad9deb460fc717de02b7a7c0ac4..e10b236af297929b7a9106669c9c170b9eec209f 100644 |
--- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp |
+++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp |
@@ -219,18 +219,16 @@ void CBC_OnedEAN8Writer::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(), leftPosition, m_Height - iTextHeight); |
} else { |
CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0, |
(FX_FLOAT)leftPosition * m_outputHScale, |
(FX_FLOAT)(m_Height - iTextHeight + iFontSize)); |
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(4, 4); |
iLen = tempStr.GetLength(); |
@@ -242,8 +240,7 @@ void CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents, |
ge.GetBitmap()->Clear(m_backgroundColor); |
ge.DrawNormalText(iLen, pCharPos + 4, 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 + 33 * multiple, |
m_Height - iTextHeight); |
} else { |
@@ -254,10 +251,9 @@ void CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents, |
if (matrix) { |
affine_matrix1.Concat(*matrix); |
} |
- device->DrawNormalText(iLen, pCharPos + 4, m_pFont, |
- CFX_GEModule::Get()->GetFontCache(), |
- (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1, |
- m_fontColor, FXTEXT_CLEARTYPE); |
+ device->DrawNormalText( |
+ iLen, pCharPos + 4, m_pFont, CFX_GEModule::Get()->GetFontCache(), |
+ (FX_FLOAT)iFontSize, &affine_matrix1, m_fontColor, FXTEXT_CLEARTYPE); |
} |
FX_Free(pCharPos); |
} |