diff options
| author | Mathias Agopian <mathias@google.com> | 2012-09-11 18:56:23 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-09-12 17:30:47 -0700 |
| commit | 068d47f29dfead847999a7b33b4217ee9514152b (patch) | |
| tree | 68b5451ab044d8891f28d67a8e7f1999927ade9b /include | |
| parent | 2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd (diff) | |
| download | frameworks_native-068d47f29dfead847999a7b33b4217ee9514152b.zip frameworks_native-068d47f29dfead847999a7b33b4217ee9514152b.tar.gz frameworks_native-068d47f29dfead847999a7b33b4217ee9514152b.tar.bz2 | |
strengthen region validation
Change-Id: I75ee7bc4dd7a2f5357ac8994a23bc8b8bfb6eb44
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/ui/RegionHelper.h | 2 | ||||
| -rw-r--r-- | include/ui/Region.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/private/ui/RegionHelper.h b/include/private/ui/RegionHelper.h index 421bdda..8c190dd 100644 --- a/include/private/ui/RegionHelper.h +++ b/include/private/ui/RegionHelper.h @@ -26,10 +26,10 @@ namespace android { template<typename RECT> class region_operator { +public: typedef typename RECT::value_type TYPE; static const TYPE max_value = 0x7FFFFFF; -public: /* * Common boolean operations: * value is computed as 0b101 op 0b110 diff --git a/include/ui/Region.h b/include/ui/Region.h index 0049fde..43a4450 100644 --- a/include/ui/Region.h +++ b/include/ui/Region.h @@ -161,7 +161,8 @@ private: static void translate(Region& reg, int dx, int dy); static void translate(Region& dst, const Region& reg, int dx, int dy); - static bool validate(const Region& reg, const char* name); + static bool validate(const Region& reg, + const char* name, bool silent = false); // mStorage is a (manually) sorted array of Rects describing the region // with an extra Rect as the last element which is set to the |