diff options
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 86be6c3..a12db6d 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -21,6 +21,7 @@ #include <errno.h> #include <math.h> #include <dlfcn.h> +#include <inttypes.h> #include <EGL/egl.h> @@ -429,7 +430,7 @@ void SurfaceFlinger::init() { // FIXME: currently we don't get blank/unblank requests // for displays other than the main display, so we always // assume a connected display is unblanked. - ALOGD("marking display %d as acquired/unblanked", i); + ALOGD("marking display %zu as acquired/unblanked", i); hw->acquireScreen(); } mDisplays.add(token, hw); @@ -1639,7 +1640,7 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const case HWC_FRAMEBUFFER_TARGET: { // this should not happen as the iterator shouldn't // let us get there. - ALOGW("HWC_FRAMEBUFFER_TARGET found in hwc list (index=%d)", i); + ALOGW("HWC_FRAMEBUFFER_TARGET found in hwc list (index=%zu)", i); break; } } @@ -2226,7 +2227,7 @@ void SurfaceFlinger::dumpStatsLocked(const Vector<String16>& args, size_t& index const nsecs_t period = getHwComposer().getRefreshPeriod(HWC_DISPLAY_PRIMARY); - result.appendFormat("%lld\n", period); + result.appendFormat("%" PRId64 "\n", period); if (name.isEmpty()) { mAnimFrameTracker.dump(result); @@ -2339,7 +2340,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, const LayerVector& currentLayers = mCurrentState.layersSortedByZ; const size_t count = currentLayers.size(); colorizer.bold(result); - result.appendFormat("Visible layers (count = %d)\n", count); + result.appendFormat("Visible layers (count = %zu)\n", count); colorizer.reset(result); for (size_t i=0 ; i<count ; i++) { const sp<Layer>& layer(currentLayers[i]); @@ -2351,7 +2352,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index, */ colorizer.bold(result); - result.appendFormat("Displays (%d entries)\n", mDisplays.size()); + result.appendFormat("Displays (%zu entries)\n", mDisplays.size()); colorizer.reset(result); for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) { const sp<const DisplayDevice>& hw(mDisplays[dpy]); @@ -2934,7 +2935,7 @@ void SurfaceFlinger::checkScreenshot(size_t w, size_t s, size_t h, void const* v const bool visible = (state.layerStack == hw->getLayerStack()) && (state.z >= minLayerZ && state.z <= maxLayerZ) && (layer->isVisible()); - ALOGE("%c index=%d, name=%s, layerStack=%d, z=%d, visible=%d, flags=%x, alpha=%x", + ALOGE("%c index=%zu, name=%s, layerStack=%d, z=%d, visible=%d, flags=%x, alpha=%x", visible ? '+' : '-', i, layer->getName().string(), state.layerStack, state.z, layer->isVisible(), state.flags, state.alpha); |