From: Dan Stoza <stoza@google.com>
Date: Thu, 22 Jan 2015 01:36:06 +0000 (-0800)
Subject: libui: Add Rect(uint32_t, uint32_t)
X-Git-Tag: android-x86-6.0-r1~75^2~86
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=471ec6b4284f645b5e933537fda88de867105fb2;p=android-x86%2Fframeworks-native.git

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
---

diff --git a/include/ui/Rect.h b/include/ui/Rect.h
index 31e28d27f7..40d11665d7 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;