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

Unified Diff: src/core/SkMatrix.cpp

Issue 1022003003: Revert of add SkMatrix::decomposeScale (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 9 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 | « src/core/SkBitmapProcState.cpp ('k') | src/core/SkPictureShader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkMatrix.cpp
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index 753c4dc61e0c8c7f50032c7e2d6d9be613977b51..9658177ec913e3b3e091104d31224e798532df70 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1603,28 +1603,6 @@
return invalid.asSkMatrix();
}
-bool SkMatrix::decomposeScale(SkSize* scale, SkMatrix* remaining) const {
- if (this->hasPerspective()) {
- return false;
- }
-
- const SkScalar sx = SkVector::Length(this->getScaleX(), this->getSkewY());
- const SkScalar sy = SkVector::Length(this->getSkewX(), this->getScaleY());
- if (!SkScalarIsFinite(sx) || !SkScalarIsFinite(sy) ||
- SkScalarNearlyZero(sx) || SkScalarNearlyZero(sy)) {
- return false;
- }
-
- if (scale) {
- scale->set(sx, sy);
- }
- if (remaining) {
- *remaining = *this;
- remaining->postScale(SkScalarInvert(sx), SkScalarInvert(sy));
- }
- return true;
-}
-
///////////////////////////////////////////////////////////////////////////////
size_t SkMatrix::writeToMemory(void* buffer) const {
« no previous file with comments | « src/core/SkBitmapProcState.cpp ('k') | src/core/SkPictureShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698