summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/MonitoredProducer.cpp
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2014-11-18 10:24:03 -0800
committerDan Stoza <stoza@google.com>2015-03-18 15:57:27 -0700
commit3be1c6b60a188dc10025e2ce156c11fac050625d (patch)
treeeab1b3c19861ba39808733d68a415ac3bf923949 /services/surfaceflinger/MonitoredProducer.cpp
parentb6b81d6acd6949a731308666ac211864f824ab50 (diff)
downloadframeworks_native-3be1c6b60a188dc10025e2ce156c11fac050625d.zip
frameworks_native-3be1c6b60a188dc10025e2ce156c11fac050625d.tar.gz
frameworks_native-3be1c6b60a188dc10025e2ce156c11fac050625d.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. Cherry pick of I034abec27bf4020d84af60d7acc1939c59986dd6 plus a couple of minor changes to CpuConsumer.cpp to make it work with a prior change: Uncomment CC_LOGV on line 46 Change C-style cast to static_cast on line 71 Change-Id: Iaec610477ea0122317b0578fb74caf2383d4cf08
Diffstat (limited to 'services/surfaceflinger/MonitoredProducer.cpp')
-rw-r--r--services/surfaceflinger/MonitoredProducer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/MonitoredProducer.cpp b/services/surfaceflinger/MonitoredProducer.cpp
index 37a044e..e4e7d42 100644
--- a/services/surfaceflinger/MonitoredProducer.cpp
+++ b/services/surfaceflinger/MonitoredProducer.cpp
@@ -61,7 +61,7 @@ status_t MonitoredProducer::setBufferCount(int bufferCount) {
}
status_t MonitoredProducer::dequeueBuffer(int* slot, sp<Fence>* fence,
- bool async, uint32_t w, uint32_t h, uint32_t format, uint32_t usage) {
+ bool async, uint32_t w, uint32_t h, PixelFormat format, uint32_t usage) {
return mProducer->dequeueBuffer(slot, fence, async, w, h, format, usage);
}
@@ -106,7 +106,7 @@ status_t MonitoredProducer::setSidebandStream(const sp<NativeHandle>& stream) {
}
void MonitoredProducer::allocateBuffers(bool async, uint32_t width,
- uint32_t height, uint32_t format, uint32_t usage) {
+ uint32_t height, PixelFormat format, uint32_t usage) {
mProducer->allocateBuffers(async, width, height, format, usage);
}