diff options
author | Dan Stoza <stoza@google.com> | 2014-11-18 10:24:03 -0800 |
---|---|---|
committer | Dan Stoza <stoza@google.com> | 2014-12-05 11:06:44 -0800 |
commit | d723bd7669b4fc88dc282d8bf8ba5ecb2849d22f (patch) | |
tree | efc2d81e4ebf1f2499c5c5ec10323c6b3013a5ba /include/gui/CpuConsumer.h | |
parent | a950eb18792da6962fcefa69b12ffc3f9d8cdca8 (diff) | |
download | frameworks_native-d723bd7669b4fc88dc282d8bf8ba5ecb2849d22f.zip frameworks_native-d723bd7669b4fc88dc282d8bf8ba5ecb2849d22f.tar.gz frameworks_native-d723bd7669b4fc88dc282d8bf8ba5ecb2849d22f.tar.bz2 |
libgui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.
Change-Id: I034abec27bf4020d84af60d7acc1939c59986dd6
Diffstat (limited to 'include/gui/CpuConsumer.h')
-rw-r--r-- | include/gui/CpuConsumer.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/gui/CpuConsumer.h b/include/gui/CpuConsumer.h index 6f4c2ec..3414ede 100644 --- a/include/gui/CpuConsumer.h +++ b/include/gui/CpuConsumer.h @@ -67,7 +67,7 @@ class CpuConsumer : public ConsumerBase // Create a new CPU consumer. The maxLockedBuffers parameter specifies // how many buffers can be locked for user access at the same time. CpuConsumer(const sp<IGraphicBufferConsumer>& bq, - uint32_t maxLockedBuffers, bool controlledByApp = false); + size_t maxLockedBuffers, bool controlledByApp = false); virtual ~CpuConsumer(); @@ -82,10 +82,9 @@ class CpuConsumer : public ConsumerBase status_t setDefaultBufferSize(uint32_t width, uint32_t height); // setDefaultBufferFormat allows CpuConsumer's BufferQueue to create buffers - // of a defaultFormat if no format is specified by producer. Formats are - // enumerated in graphics.h; the initial default is - // HAL_PIXEL_FORMAT_RGBA_8888. - status_t setDefaultBufferFormat(uint32_t defaultFormat); + // of a defaultFormat if no format is specified by producer. + // The initial default is PIXEL_FORMAT_RGBA_8888. + status_t setDefaultBufferFormat(PixelFormat defaultFormat); // Gets the next graphics buffer from the producer and locks it for CPU use, // filling out the passed-in locked buffer structure with the native pointer @@ -106,9 +105,9 @@ class CpuConsumer : public ConsumerBase private: // Maximum number of buffers that can be locked at a time - uint32_t mMaxLockedBuffers; + size_t mMaxLockedBuffers; - status_t releaseAcquiredBufferLocked(int lockedIdx); + status_t releaseAcquiredBufferLocked(size_t lockedIdx); virtual void freeBufferLocked(int slotIndex); @@ -129,7 +128,7 @@ class CpuConsumer : public ConsumerBase Vector<AcquiredBuffer> mAcquiredBuffers; // Count of currently locked buffers - uint32_t mCurrentLockedBuffers; + size_t mCurrentLockedBuffers; }; |