From fda3aee5b7b17bc64e66e1f6f7aaa7d2e3ac1419 Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Fri, 15 Feb 2019 17:10:53 -0600 Subject: Swap width and height in TouchVideoFrame Currently in TouchVideoFrame and related code, the field 'width' precedes the field 'height'. But these fields should be interpreted as follows: width -> number of columns height -> number of rows In most notations in mathematics, the matrix sizes are designated as 'mxn', where m is the number of rows and n is the number of columns. So we make TouchVideoFrame consistent with this, and swap these 2 fields. Test: atest libinput_tests The actual test is added in the next commit. Bug: 123241238 Change-Id: I808e7f354bd7b62d5599324eef205bf4450a91c1 --- include/input/TouchVideoFrame.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/input/TouchVideoFrame.h') diff --git a/include/input/TouchVideoFrame.h b/include/input/TouchVideoFrame.h index a0f4f2703f..566c334e57 100644 --- a/include/input/TouchVideoFrame.h +++ b/include/input/TouchVideoFrame.h @@ -30,19 +30,19 @@ namespace android { */ class TouchVideoFrame { public: - TouchVideoFrame(uint32_t width, uint32_t height, std::vector data, + TouchVideoFrame(uint32_t height, uint32_t width, std::vector data, const struct timeval& timestamp); bool operator==(const TouchVideoFrame& rhs) const; - /** - * Width of the frame - */ - uint32_t getWidth() const; /** * Height of the frame */ uint32_t getHeight() const; + /** + * Width of the frame + */ + uint32_t getWidth() const; /** * The touch strength data. * The array is a 2-D row-major matrix, with dimensions (height, width). @@ -56,8 +56,8 @@ public: const struct timeval& getTimestamp() const; private: - uint32_t mWidth; uint32_t mHeight; + uint32_t mWidth; std::vector mData; struct timeval mTimestamp; }; -- cgit v1.2.3-59-g8ed1b