ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

libui: Add Rect(uint32_t, uint32_t)

Browse Source 
Adds a Rect constructor that takes uint32_t instead of int32_t, as
required by a change to Region and -Werror

Change-Id: If91915e5b4ec9ce9e7ba0fb84f03b045d000b023
This commit is contained in:
Dan Stoza 2015-01-21 17:36:06 -08:00
parent e18155e1c6
commit 471ec6b428
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/ui/Rect.h
View File

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