diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-04 19:18:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-04 19:18:03 +0000 |
| commit | eac548c65c30b04983a8c904f9a1c6003d428196 (patch) | |
| tree | 747426f173326f7e521fbc1c665919dde9662d16 /opengl | |
| parent | 8ffc2346b86ef5a0d686b43229d2bbd70545a208 (diff) | |
| parent | 61d6a00895d2e8b9085278d0acbf98c19e7d6ed5 (diff) | |
| download | frameworks_native-eac548c65c30b04983a8c904f9a1c6003d428196.zip frameworks_native-eac548c65c30b04983a8c904f9a1c6003d428196.tar.gz frameworks_native-eac548c65c30b04983a8c904f9a1c6003d428196.tar.bz2 | |
am 61d6a008: Merge "hwc test: 64-bit compilation error"
* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
hwc test: 64-bit compilation error
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/tests/hwc/hwcStress.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/tests/hwc/hwcStress.cpp b/opengl/tests/hwc/hwcStress.cpp index 3e8ea8d..dfaa6c1 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); } |