OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6b4e5b7
)
hwc test: 64-bit compilation error
author
Mark Salyzyn
<salyzyn@google.com>
Tue, 4 Mar 2014 17:11:04 +0000
(09:11 -0800)
committer
Mark Salyzyn
<salyzyn@google.com>
Tue, 4 Mar 2014 17:11:04 +0000
(09:11 -0800)
* cast 1u to size_t in max() argument lists
Change-Id: I02f711c89e96e4cfc348f1c7bac455339bec2fa1
opengl/tests/hwc/hwcStress.cpp
patch
|
blob
|
history
diff --git
a/opengl/tests/hwc/hwcStress.cpp
b/opengl/tests/hwc/hwcStress.cpp
index
3e8ea8d
..
dfaa6c1
100644
(file)
--- 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);
}