From ed5fd384b7401fbb6143eb7107cbfe9af46116be Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Fri, 2 May 2014 17:53:33 +0100 Subject: [PATCH] Change InputMessage.motion.pointerSize to a uint32_t. This ensures it's the same size in both 32 and 64 bit processes and also brings it in line with struct MotionEntry. (cherry-picked from bc6001b026069714177526eb1120b0011d6f2a51) Change-Id: I28e87050478920a54132efbbb8138076ebad1409 --- include/input/InputTransport.h | 6 +++--- libs/input/InputTransport.cpp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/input/InputTransport.h b/include/input/InputTransport.h index 609b6799f..8ffdfca0d 100644 --- a/include/input/InputTransport.h +++ b/include/input/InputTransport.h @@ -86,7 +86,7 @@ struct InputMessage { float yOffset; float xPrecision; float yPrecision; - size_t pointerCount; + uint32_t pointerCount; struct Pointer { PointerProperties properties; PointerCoords coords; @@ -234,7 +234,7 @@ public: float yPrecision, nsecs_t downTime, nsecs_t eventTime, - size_t pointerCount, + uint32_t pointerCount, const PointerProperties* pointerProperties, const PointerCoords* pointerCoords); @@ -360,7 +360,7 @@ private: void initializeFrom(const InputMessage* msg) { eventTime = msg->body.motion.eventTime; idBits.clear(); - for (size_t i = 0; i < msg->body.motion.pointerCount; i++) { + for (uint32_t i = 0; i < msg->body.motion.pointerCount; i++) { uint32_t id = msg->body.motion.pointers[i].properties.id; idBits.markBit(id); idToIndex[id] = i; diff --git a/libs/input/InputTransport.cpp b/libs/input/InputTransport.cpp index 09b2e7c5c..2d0fb8c11 100644 --- a/libs/input/InputTransport.cpp +++ b/libs/input/InputTransport.cpp @@ -292,7 +292,7 @@ status_t InputPublisher::publishMotionEvent( float yPrecision, nsecs_t downTime, nsecs_t eventTime, - size_t pointerCount, + uint32_t pointerCount, const PointerProperties* pointerProperties, const PointerCoords* pointerCoords) { #if DEBUG_TRANSPORT_ACTIONS @@ -334,7 +334,7 @@ status_t InputPublisher::publishMotionEvent( msg.body.motion.downTime = downTime; msg.body.motion.eventTime = eventTime; msg.body.motion.pointerCount = pointerCount; - for (size_t i = 0; i < pointerCount; i++) { + for (uint32_t i = 0; i < pointerCount; i++) { msg.body.motion.pointers[i].properties.copyFrom(pointerProperties[i]); msg.body.motion.pointers[i].coords.copyFrom(pointerCoords[i]); } @@ -654,7 +654,7 @@ void InputConsumer::updateTouchState(InputMessage* msg) { } void InputConsumer::rewriteMessage(const TouchState& state, InputMessage* msg) { - for (size_t i = 0; i < msg->body.motion.pointerCount; i++) { + for (uint32_t i = 0; i < msg->body.motion.pointerCount; i++) { uint32_t id = msg->body.motion.pointers[i].properties.id; if (state.lastResample.idBits.hasBit(id)) { PointerCoords& msgCoords = msg->body.motion.pointers[i].coords; @@ -894,10 +894,10 @@ void InputConsumer::initializeKeyEvent(KeyEvent* event, const InputMessage* msg) } void InputConsumer::initializeMotionEvent(MotionEvent* event, const InputMessage* msg) { - size_t pointerCount = msg->body.motion.pointerCount; + uint32_t pointerCount = msg->body.motion.pointerCount; PointerProperties pointerProperties[pointerCount]; PointerCoords pointerCoords[pointerCount]; - for (size_t i = 0; i < pointerCount; i++) { + for (uint32_t i = 0; i < pointerCount; i++) { pointerProperties[i].copyFrom(msg->body.motion.pointers[i].properties); pointerCoords[i].copyFrom(msg->body.motion.pointers[i].coords); } @@ -922,9 +922,9 @@ void InputConsumer::initializeMotionEvent(MotionEvent* event, const InputMessage } void InputConsumer::addSample(MotionEvent* event, const InputMessage* msg) { - size_t pointerCount = msg->body.motion.pointerCount; + uint32_t pointerCount = msg->body.motion.pointerCount; PointerCoords pointerCoords[pointerCount]; - for (size_t i = 0; i < pointerCount; i++) { + for (uint32_t i = 0; i < pointerCount; i++) { pointerCoords[i].copyFrom(msg->body.motion.pointers[i].coords); } @@ -934,7 +934,7 @@ void InputConsumer::addSample(MotionEvent* event, const InputMessage* msg) { bool InputConsumer::canAddSample(const Batch& batch, const InputMessage *msg) { const InputMessage& head = batch.samples.itemAt(0); - size_t pointerCount = msg->body.motion.pointerCount; + uint32_t pointerCount = msg->body.motion.pointerCount; if (head.body.motion.pointerCount != pointerCount || head.body.motion.action != msg->body.motion.action) { return false;