summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-04 19:10:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-04 19:10:29 +0000
commit61d6a00895d2e8b9085278d0acbf98c19e7d6ed5 (patch)
treed538ff8ffa1b63f286485c468836621d1c065f90
parent6b4e5b7f856c32b75e9a22df4c3f2273ae906acb (diff)
parente933c0396f1350c71b6753a5e25a82d800b1a9ae (diff)
downloadnative-61d6a00895d2e8b9085278d0acbf98c19e7d6ed5.tar.gz
Merge "hwc test: 64-bit compilation error"
-rw-r--r--opengl/tests/hwc/hwcStress.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/tests/hwc/hwcStress.cpp b/opengl/tests/hwc/hwcStress.cpp
index 3e8ea8dba6..dfaa6c1202 100644
--- a/opengl/tests/hwc/hwcStress.cpp
+++ b/opengl/tests/hwc/hwcStress.cpp
@@ -574,8 +574,8 @@ void initFrames(unsigned int seed)
// mod the wMod/hMod value must be equal to 0.
size_t w = (width * maxSizeRatio) * testRandFract();
size_t h = (height * maxSizeRatio) * testRandFract();
- w = max(1u, w);
- h = max(1u, h);
+ w = max(size_t(1u), w);
+ h = max(size_t(1u), h);
if ((w % formatPtr->wMod) != 0) {
w += formatPtr->wMod - (w % formatPtr->wMod);
}