summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-28 06:05:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-28 06:05:03 +0000
commitdf44fe72a6a9d163bb23a0808cf74241006600b0 (patch)
tree0aac153cc434db67b6dc58d559157667d03920b9 /modules
parent9d018618c4a467ed19ce96c04d6fe13fd125fcba (diff)
parent32fb8b2d9f8399a745a26dddc031cc16867ada2d (diff)
downloadhardware_libhardware-df44fe72a6a9d163bb23a0808cf74241006600b0.zip
hardware_libhardware-df44fe72a6a9d163bb23a0808cf74241006600b0.tar.gz
hardware_libhardware-df44fe72a6a9d163bb23a0808cf74241006600b0.tar.bz2
am 32fb8b2d: Merge "Fix C++11 build."
* commit '32fb8b2d9f8399a745a26dddc031cc16867ada2d': Fix C++11 build.
Diffstat (limited to 'modules')
-rw-r--r--modules/camera/Stream.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/camera/Stream.cpp b/modules/camera/Stream.cpp
index 2db3ed2..90ad30b 100644
--- a/modules/camera/Stream.cpp
+++ b/modules/camera/Stream.cpp
@@ -227,15 +227,15 @@ void Stream::dump(int fd)
dprintf(fd, "Stream ID: %d (%p)\n", mId, mStream);
dprintf(fd, "Stream Type: %s (%d)\n", typeToString(mType), mType);
- dprintf(fd, "Width: %"PRIu32" Height: %"PRIu32"\n", mWidth, mHeight);
+ dprintf(fd, "Width: %" PRIu32 " Height: %" PRIu32 "\n", mWidth, mHeight);
dprintf(fd, "Stream Format: %s (%d)", formatToString(mFormat), mFormat);
// ToDo: prettyprint usage mask flags
- dprintf(fd, "Gralloc Usage Mask: %#"PRIx32"\n", mUsage);
- dprintf(fd, "Max Buffer Count: %"PRIu32"\n", mMaxBuffers);
+ dprintf(fd, "Gralloc Usage Mask: %#" PRIx32 "\n", mUsage);
+ dprintf(fd, "Max Buffer Count: %" PRIu32 "\n", mMaxBuffers);
dprintf(fd, "Buffers Registered: %s\n", mRegistered ? "true" : "false");
- dprintf(fd, "Number of Buffers: %"PRIu32"\n", mNumBuffers);
+ dprintf(fd, "Number of Buffers: %" PRIu32 "\n", mNumBuffers);
for (uint32_t i = 0; i < mNumBuffers; i++) {
- dprintf(fd, "Buffer %"PRIu32"/%"PRIu32": %p\n", i, mNumBuffers,
+ dprintf(fd, "Buffer %" PRIu32 "/%" PRIu32 ": %p\n", i, mNumBuffers,
mBuffers[i]);
}
}