summaryrefslogtreecommitdiff
path: root/libs/hwui/Matrix.h
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-09-17 18:53:11 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-09-17 18:53:11 -0700
commit7cb404dda770da24aaf1b484d6575d5480cf080f (patch)
tree3dcacbd111f82a63aa32e01071bddc0c16450946 /libs/hwui/Matrix.h
parent30a1707a5f7798ed5f885e1aa8c809ce2aa2aa68 (diff)
parenta42ceb03cf6a1cbcd9f526afb02d806b2c200ee3 (diff)
am a42ceb03: Merge "Disallow negative scale matrices in merged Bitmap drawing" into klp-dev
* commit 'a42ceb03cf6a1cbcd9f526afb02d806b2c200ee3': Disallow negative scale matrices in merged Bitmap drawing
Diffstat (limited to 'libs/hwui/Matrix.h')
-rw-r--r--libs/hwui/Matrix.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h
index 5116203e3b5a..e2c5b2088e7a 100644
--- a/libs/hwui/Matrix.h
+++ b/libs/hwui/Matrix.h
@@ -64,7 +64,8 @@ public:
kTypeAffine = 0x4,
kTypePerspective = 0x8,
kTypeRectToRect = 0x10,
- kTypeUnknown = 0x20,
+ kTypePositiveScale = 0x20,
+ kTypeUnknown = 0x40,
};
static const int sGeometryMask = 0xf;
@@ -183,6 +184,7 @@ public:
bool isIdentity() const;
bool isPerspective() const;
bool rectToRect() const;
+ bool positiveScale() const;
bool changesBounds() const;