diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-09 13:07:43 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-09 19:02:55 +0000 |
| commit | afb44560a21298b3588b36cbaf45e2be50f2e75b (patch) | |
| tree | 21f3ececad017e6be64a19c4370cfe9fd7f9c29c /core/fpdfapi/page | |
| parent | 67e4faaf8be0aebc67ebfb96d33933d9f9119d20 (diff) | |
| download | pdfium-afb44560a21298b3588b36cbaf45e2be50f2e75b.tar.xz | |
Remove Transform in favour of TransformPoint
This CL removes the two Transform() overrides from CFX_Matrix and calls the
TransformPoint methods directly. In the case of the 4 param version the
values were assigned to the out values before calling.
Change-Id: Id633826caec75b848774dcda6cfdcef2dbf5a7db
Reviewed-on: https://pdfium-review.googlesource.com/2573
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fpdfapi/page')
| -rw-r--r-- | core/fpdfapi/page/cpdf_meshstream.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfapi/page/cpdf_streamcontentparser.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/fpdfapi/page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp index 8bc2a851cc..b852901794 100644 --- a/core/fpdfapi/page/cpdf_meshstream.cpp +++ b/core/fpdfapi/page/cpdf_meshstream.cpp @@ -195,7 +195,7 @@ uint32_t CPDF_MeshStream::GetVertex(CPDF_MeshVertex& vertex, CFX_Matrix* pObject2Bitmap) { uint32_t flag = GetFlag(); GetCoords(vertex.x, vertex.y); - pObject2Bitmap->Transform(vertex.x, vertex.y); + pObject2Bitmap->TransformPoint(vertex.x, vertex.y); GetColor(vertex.r, vertex.g, vertex.b); m_BitStream.ByteAlign(); return flag; @@ -209,7 +209,7 @@ bool CPDF_MeshStream::GetVertexRow(CPDF_MeshVertex* vertex, return false; GetCoords(vertex[i].x, vertex[i].y); - pObject2Bitmap->Transform(vertex[i].x, vertex[i].y); + pObject2Bitmap->TransformPoint(vertex[i].x, vertex[i].y); GetColor(vertex[i].r, vertex[i].g, vertex[i].b); m_BitStream.ByteAlign(); } diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp index 1fcb27a8c8..93478de174 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp +++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp @@ -1230,13 +1230,13 @@ CPDF_Pattern* CPDF_StreamContentParser::FindPattern(const CFX_ByteString& name, } void CPDF_StreamContentParser::ConvertTextSpace(FX_FLOAT& x, FX_FLOAT& y) { - m_pCurStates->m_TextMatrix.Transform(x, y, x, y); + m_pCurStates->m_TextMatrix.TransformPoint(x, y); ConvertUserSpace(x, y); } void CPDF_StreamContentParser::ConvertUserSpace(FX_FLOAT& x, FX_FLOAT& y) { - m_pCurStates->m_CTM.Transform(x, y, x, y); - m_mtContentToUser.Transform(x, y, x, y); + m_pCurStates->m_CTM.TransformPoint(x, y); + m_mtContentToUser.TransformPoint(x, y); } void CPDF_StreamContentParser::AddTextObject(CFX_ByteString* pStrs, |