summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-11 13:35:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-11 13:35:02 +0000
commit3c9130a8a12ce962dc8d22e04243b135b9e98b01 (patch)
treeb938e1d75a1beefae86244f287ca22f4a277740d /camera
parentcdda7bf4d3ca9cad6979374a18dd5be79ea83d80 (diff)
parent377b2ec9a2885f9b6405b07ba900a9e3f4349c38 (diff)
downloadframeworks_av-3c9130a8a12ce962dc8d22e04243b135b9e98b01.zip
frameworks_av-3c9130a8a12ce962dc8d22e04243b135b9e98b01.tar.gz
frameworks_av-3c9130a8a12ce962dc8d22e04243b135b9e98b01.tar.bz2
Merge "Make frameworks/av 64-bit compatible"
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index c51f265..af091f4 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -470,7 +470,7 @@ status_t CameraParameters::dump(int fd, const Vector<String16>& args) const
const size_t SIZE = 256;
char buffer[SIZE];
String8 result;
- snprintf(buffer, 255, "CameraParameters::dump: mMap.size = %d\n", mMap.size());
+ snprintf(buffer, 255, "CameraParameters::dump: mMap.size = %zu\n", mMap.size());
result.append(buffer);
for (size_t i = 0; i < mMap.size(); i++) {
String8 k, v;