summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-01-21 17:36:06 -0800
committerDan Stoza <stoza@google.com>2015-01-21 17:39:13 -0800
commit471ec6b4284f645b5e933537fda88de867105fb2 (patch)
tree9f8f9c4e46b7d82dddbb92ad84839581d439c067
parente18155e1c68a2ccd8ed2eb86b7c8c8481747ac0c (diff)
downloadframeworks_native-471ec6b4284f645b5e933537fda88de867105fb2.zip
frameworks_native-471ec6b4284f645b5e933537fda88de867105fb2.tar.gz
frameworks_native-471ec6b4284f645b5e933537fda88de867105fb2.tar.bz2
libui: Add Rect(uint32_t, uint32_t)
Adds a Rect constructor that takes uint32_t instead of int32_t, as required by a change to Region and -Werror Change-Id: If91915e5b4ec9ce9e7ba0fb84f03b045d000b023
-rw-r--r--include/ui/Rect.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/include/ui/Rect.h b/include/ui/Rect.h
index 31e28d2..40d1166 100644
--- a/include/ui/Rect.h
+++ b/include/ui/Rect.h
@@ -18,6 +18,7 @@
#define ANDROID_UI_RECT
#include <utils/Flattenable.h>
+#include <utils/Log.h>
#include <utils/TypeHelpers.h>
#include <ui/Point.h>
@@ -43,6 +44,22 @@ public:
bottom = h;
}
+ inline Rect(uint32_t w, uint32_t h) {
+ if (w > INT32_MAX) {
+ ALOG(LOG_WARN, "Rect",
+ "Width %u too large for Rect class, clamping", w);
+ w = INT32_MAX;
+ }
+ if (h > INT32_MAX) {
+ ALOG(LOG_WARN, "Rect",
+ "Height %u too large for Rect class, clamping", h);
+ h = INT32_MAX;
+ }
+ left = top = 0;
+ right = w;
+ bottom = h;
+ }
+
inline Rect(int32_t l, int32_t t, int32_t r, int32_t b) {
left = l;
top = t;