diff options
author | Lei Zhang <thestig@chromium.org> | 2018-04-10 19:02:15 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-10 19:02:15 +0000 |
commit | e5c3ebd923a21c6c82bd214ca27a5d7396b852c2 (patch) | |
tree | d952cc04bd711b5dd21ad2dcce7ea307024c719b /fxbarcode/oned | |
parent | 85ba2610cf05a75b52681f381bba2da3ba37b984 (diff) | |
download | pdfium-e5c3ebd923a21c6c82bd214ca27a5d7396b852c2.tar.xz |
Change CFX_RenderDevice::FillRect() to take FX_RECT by const-ref.
It currently takes const FX_RECT*, but the pointer is never nullptr.
Change-Id: I571e9e8dd04756bc4daa25a61a5af8d1f902914b
Reviewed-on: https://pdfium-review.googlesource.com/30052
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'fxbarcode/oned')
-rw-r--r-- | fxbarcode/oned/BC_OneDimWriter.cpp | 2 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedEAN13Writer.cpp | 6 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedEAN8Writer.cpp | 4 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OnedUPCAWriter.cpp | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp index 040257b425..03be25fc35 100644 --- a/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/fxbarcode/oned/BC_OneDimWriter.cpp @@ -191,7 +191,7 @@ void CBC_OneDimWriter::ShowDeviceChars(CFX_RenderDevice* device, rect.right -= 1; } FX_RECT re = matrix->TransformRect(rect).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); CFX_Matrix affine_matrix(1.0, 0.0, 0.0, -1.0, (float)locX, (float)(locY + iFontSize)); if (matrix) { diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp index a6315bcdbb..6818d432d6 100644 --- a/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -157,21 +157,21 @@ bool CBC_OnedEAN13Writer::ShowChars(const WideStringView& contents, (float)(leftPosition + strWidth - 0.5), (float)m_Height); matr.Concat(*matrix); FX_RECT re = matr.TransformRect(rect).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); CFX_FloatRect rect1( (float)(leftPosition + 47 * multiple), (float)(m_Height - iTextHeight), (float)(leftPosition + 47 * multiple + strWidth - 0.5), (float)m_Height); CFX_Matrix matr1(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0); matr1.Concat(*matrix); re = matr1.TransformRect(rect1).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); int32_t strWidth1 = multiple * 7; CFX_Matrix matr2(m_outputHScale, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f); CFX_FloatRect rect2(0.0f, (float)(m_Height - iTextHeight), (float)strWidth1 - 0.5f, (float)m_Height); matr2.Concat(*matrix); re = matr2.TransformRect(rect2).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); float blank = 0.0; iLen = tempStr.GetLength(); diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/fxbarcode/oned/BC_OnedEAN8Writer.cpp index 988528ed09..6862ba87a1 100644 --- a/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -160,14 +160,14 @@ bool CBC_OnedEAN8Writer::ShowChars(const WideStringView& contents, (float)(leftPosition + strWidth - 0.5), (float)m_Height); matr.Concat(*matrix); FX_RECT re = matr.TransformRect(rect).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); CFX_Matrix matr1(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0); CFX_FloatRect rect1( (float)(leftPosition + 33 * multiple), (float)(m_Height - iTextHeight), (float)(leftPosition + 33 * multiple + strWidth - 0.5), (float)m_Height); matr1.Concat(*matrix); re = matr1.TransformRect(rect1).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); strWidth = (int32_t)(strWidth * m_outputHScale); CalcTextInfo(tempStr, charpos.data(), m_pFont.Get(), (float)strWidth, diff --git a/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 025f851526..daabe9eb3b 100644 --- a/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -128,7 +128,7 @@ bool CBC_OnedUPCAWriter::ShowChars(const WideStringView& contents, (float)(leftPosition + strWidth - 0.5), (float)m_Height); matr.Concat(*matrix); FX_RECT re = matr.TransformRect(rect).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); CFX_Matrix matr1(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0); CFX_FloatRect rect1((float)(leftPosition + 40 * multiple), (float)(m_Height - iTextHeight), @@ -136,14 +136,14 @@ bool CBC_OnedUPCAWriter::ShowChars(const WideStringView& contents, (float)m_Height); matr1.Concat(*matrix); re = matr1.TransformRect(rect1).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); float strWidth1 = (float)multiple * 7; CFX_Matrix matr2(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0); CFX_FloatRect rect2(0.0, (float)(m_Height - iTextHeight), (float)strWidth1 - 1, (float)m_Height); matr2.Concat(*matrix); re = matr2.TransformRect(rect2).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); CFX_Matrix matr3(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0); CFX_FloatRect rect3((float)(leftPosition + 85 * multiple), (float)(m_Height - iTextHeight), @@ -151,7 +151,7 @@ bool CBC_OnedUPCAWriter::ShowChars(const WideStringView& contents, (float)m_Height); matr3.Concat(*matrix); re = matr3.TransformRect(rect3).GetOuterRect(); - device->FillRect(&re, m_backgroundColor); + device->FillRect(re, m_backgroundColor); strWidth = strWidth * m_outputHScale; CalcTextInfo(tempStr, &charpos[1], m_pFont.Get(), strWidth, iFontSize, blank); |