Merge "hwc test: 64-bit compilation error"
This commit is contained in:
commit
61d6a00895
@ -574,8 +574,8 @@ void initFrames(unsigned int seed)
|
|||||||
// mod the wMod/hMod value must be equal to 0.
|
// mod the wMod/hMod value must be equal to 0.
|
||||||
size_t w = (width * maxSizeRatio) * testRandFract();
|
size_t w = (width * maxSizeRatio) * testRandFract();
|
||||||
size_t h = (height * maxSizeRatio) * testRandFract();
|
size_t h = (height * maxSizeRatio) * testRandFract();
|
||||||
w = max(1u, w);
|
w = max(size_t(1u), w);
|
||||||
h = max(1u, h);
|
h = max(size_t(1u), h);
|
||||||
if ((w % formatPtr->wMod) != 0) {
|
if ((w % formatPtr->wMod) != 0) {
|
||||||
w += formatPtr->wMod - (w % formatPtr->wMod);
|
w += formatPtr->wMod - (w % formatPtr->wMod);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user