diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-06-29 12:02:06 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-06-29 20:50:09 +0000 |
| commit | b21f174ad87e46c823c2ef8c11682167e2d12864 (patch) | |
| tree | 79c3661672cbd2f84ee835f9922231bb90a634b3 /fpdfsdk/pdfwindow | |
| parent | 8ce58f522e046ae3b1561d592ca7b3cd7c894731 (diff) | |
| download | pdfium-b21f174ad87e46c823c2ef8c11682167e2d12864.tar.xz | |
Change SetReverse to GetInverse in CFX_Matrix
CFX_Matrix::GetInverse is much clearer.
Change-Id: Id10ab1723735332e1a78de853f28415ec3a4d834
Reviewed-on: https://pdfium-review.googlesource.com/7090
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow')
| -rw-r--r-- | fpdfsdk/pdfwindow/cpwl_icon.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/pdfwindow/cpwl_wnd.cpp | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fpdfsdk/pdfwindow/cpwl_icon.cpp b/fpdfsdk/pdfwindow/cpwl_icon.cpp index 6650311915..ebf3b4fc12 100644 --- a/fpdfsdk/pdfwindow/cpwl_icon.cpp +++ b/fpdfsdk/pdfwindow/cpwl_icon.cpp @@ -23,8 +23,7 @@ CFX_ByteString CPWL_Image::GetImageAppStream() { CFX_ByteString sAlias = GetImageAlias(); CFX_FloatRect rcPlate = GetClientRect(); - CFX_Matrix mt; - mt.SetReverse(GetImageMatrix()); + CFX_Matrix mt = GetImageMatrix().GetInverse(); float fHScale = 1.0f; float fVScale = 1.0f; diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.cpp b/fpdfsdk/pdfwindow/cpwl_wnd.cpp index a8b5c31254..85a610eea5 100644 --- a/fpdfsdk/pdfwindow/cpwl_wnd.cpp +++ b/fpdfsdk/pdfwindow/cpwl_wnd.cpp @@ -765,7 +765,9 @@ CFX_PointF CPWL_Wnd::ParentToChild(const CFX_PointF& point) const { if (mt.IsIdentity()) return point; - mt.SetReverse(mt); + CFX_Matrix inverse = mt.GetInverse(); + if (!inverse.IsIdentity()) + mt = inverse; return mt.Transform(point); } @@ -774,7 +776,9 @@ CFX_FloatRect CPWL_Wnd::ParentToChild(const CFX_FloatRect& rect) const { if (mt.IsIdentity()) return rect; - mt.SetReverse(mt); + CFX_Matrix inverse = mt.GetInverse(); + if (!inverse.IsIdentity()) + mt = inverse; CFX_FloatRect rc = rect; mt.TransformRect(rc); return rc; |