am eac548c6: am 61d6a008: Merge "hwc test: 64-bit compilation error"

* commit 'eac548c65c30b04983a8c904f9a1c6003d428196':
  hwc test: 64-bit compilation error
This commit is contained in:
Mark Salyzyn 2014-03-04 19:22:43 +00:00 committed by Android Git Automerger
commit d5bb577de0

View File

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