From 6c5a17dd2603b282cb0800c262857dc0f3d55f7e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 27 Sep 2016 14:12:48 -0700 Subject: [PATCH] Fix libgui warnings The warnings were being hidden by the use of -isystem to include frameworks/native/include. Bug: 31752268 Test: m -j Merged-in: Idba8278bc0a73886ecb7978617854b433c0b5875 Change-Id: Idba8278bc0a73886ecb7978617854b433c0b5875 --- include/gui/BufferQueueCore.h | 4 ++-- include/gui/IGraphicBufferProducer.h | 2 +- libs/gui/Surface.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/gui/BufferQueueCore.h b/include/gui/BufferQueueCore.h index 4ab5db12f2..8e9b0fc854 100644 --- a/include/gui/BufferQueueCore.h +++ b/include/gui/BufferQueueCore.h @@ -305,8 +305,8 @@ private: // Cached data about the shared buffer in shared buffer mode struct SharedBufferCache { - SharedBufferCache(Rect _crop, uint32_t _transform, int _scalingMode, - android_dataspace _dataspace) + SharedBufferCache(Rect _crop, uint32_t _transform, + uint32_t _scalingMode, android_dataspace _dataspace) : crop(_crop), transform(_transform), scalingMode(_scalingMode), diff --git a/include/gui/IGraphicBufferProducer.h b/include/gui/IGraphicBufferProducer.h index 00ed239b2b..d74f1f652e 100644 --- a/include/gui/IGraphicBufferProducer.h +++ b/include/gui/IGraphicBufferProducer.h @@ -350,7 +350,7 @@ public: }; // QueueBufferOutput must be a POD structure - struct __attribute__ ((__packed__)) QueueBufferOutput { + struct QueueBufferOutput { inline QueueBufferOutput() { } // outWidth - filled with default width applied to the buffer // outHeight - filled with default height applied to the buffer diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 9d130cd974..1879f8a099 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -371,7 +371,7 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) { timestamp = systemTime(SYSTEM_TIME_MONOTONIC); isAutoTimestamp = true; ALOGV("Surface::queueBuffer making up timestamp: %.2f ms", - timestamp / 1000000.f); + timestamp / 1000000.0); } else { timestamp = mTimestamp; } -- 2.11.0