diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-07-09 17:05:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 17:05:23 -0700 |
| commit | 8445ca6c3ba9b7cee6d20f5919e3b3ba8e6b8c96 (patch) | |
| tree | 9d91e1020e2f75baf83cd9b9b4934c81fe7025d6 /libs/ui/Rect.cpp | |
| parent | 3a70b20ee5aa2c0d451f1d2a5701bf9c43c8ca6f (diff) | |
| parent | b14f325a0118ffce286155caaabaae149653462c (diff) | |
| download | frameworks_base-8445ca6c3ba9b7cee6d20f5919e3b3ba8e6b8c96.zip frameworks_base-8445ca6c3ba9b7cee6d20f5919e3b3ba8e6b8c96.tar.gz frameworks_base-8445ca6c3ba9b7cee6d20f5919e3b3ba8e6b8c96.tar.bz2 | |
am b14f325a: am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.
Merge commit 'b14f325a0118ffce286155caaabaae149653462c'
* commit 'b14f325a0118ffce286155caaabaae149653462c':
Add ANativeWindow API for directly drawing to the surface bits.
Diffstat (limited to 'libs/ui/Rect.cpp')
| -rw-r--r-- | libs/ui/Rect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ui/Rect.cpp b/libs/ui/Rect.cpp index 66b9576..5694e00 100644 --- a/libs/ui/Rect.cpp +++ b/libs/ui/Rect.cpp @@ -18,11 +18,11 @@ namespace android { -static inline int min(int a, int b) { +static inline int32_t min(int32_t a, int32_t b) { return (a<b) ? a : b; } -static inline int max(int a, int b) { +static inline int32_t max(int32_t a, int32_t b) { return (a>b) ? a : b; } @@ -53,7 +53,7 @@ bool Rect::operator < (const Rect& rhs) const return false; } -Rect& Rect::offsetTo(int x, int y) +Rect& Rect::offsetTo(int32_t x, int32_t y) { right -= left - x; bottom -= top - y; @@ -62,7 +62,7 @@ Rect& Rect::offsetTo(int x, int y) return *this; } -Rect& Rect::offsetBy(int x, int y) +Rect& Rect::offsetBy(int32_t x, int32_t y) { left += x; top += y; |