summaryrefslogtreecommitdiffstats
path: root/include/ui/Rect.h
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-11-18 10:24:03 -0800
committerDan Stoza <stoza@google.com>2014-12-05 14:59:29 -0800
commitdd883c0b08d2a60f89542b9b9f5fdabcb14885c7 (patch)
treeaca9fd053f4c3e695c40decd72ce97a3dda44931 /include/ui/Rect.h
parente1a2caeb2c75840b092081e28d988342ee958c34 (diff)
downloadframeworks_native-dd883c0b08d2a60f89542b9b9f5fdabcb14885c7.zip
frameworks_native-dd883c0b08d2a60f89542b9b9f5fdabcb14885c7.tar.gz
frameworks_native-dd883c0b08d2a60f89542b9b9f5fdabcb14885c7.tar.bz2
libgui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for warnings we can't (or shouldn't need to) work around. This is a squashed commit based on an initial change with a couple of fixes to avoid breaking certain targets. The source commits are: d723bd7669b4fc88dc282d8bf8ba5ecb2849d22f 00d504c06ea034befe143e6b8cb34d004670ed02 429ba89cd293633d2f882165066b422c96597df2 Change-Id: I034abec27bf4020d84af60d7acc1939c59986dd6
Diffstat (limited to 'include/ui/Rect.h')
-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;