am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '2c125876208c6b7173ef561316843d64ae1599e2':
Change InputMessage.motion.pointerSize to a uint32_t.
diff --git a/libs/input/InputDispatcher.cpp b/libs/input/InputDispatcher.cpp
index 22d1871..f594df2 100644
--- a/libs/input/InputDispatcher.cpp
+++ b/libs/input/InputDispatcher.cpp
@@ -1962,7 +1962,7 @@
xOffset = dispatchEntry->xOffset * scaleFactor;
yOffset = dispatchEntry->yOffset * scaleFactor;
if (scaleFactor != 1.0f) {
- for (size_t i = 0; i < motionEntry->pointerCount; i++) {
+ for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
scaledCoords[i] = motionEntry->pointerCoords[i];
scaledCoords[i].scale(scaleFactor);
}
@@ -1975,7 +1975,7 @@
// We don't want the dispatch target to know.
if (dispatchEntry->targetFlags & InputTarget::FLAG_ZERO_COORDS) {
- for (size_t i = 0; i < motionEntry->pointerCount; i++) {
+ for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
scaledCoords[i].clear();
}
usingCoords = scaledCoords;