diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 13:41:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-11 13:41:54 +0000 |
| commit | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 (patch) | |
| tree | 6a7f5163818f67bee2bcbeffc5f9c2f12e9aa49d /camera | |
| parent | 66e05682e4e5d52673b11e7950c0559532f4b6cb (diff) | |
| parent | 3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff) | |
| download | frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.zip frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.tar.gz frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.tar.bz2 | |
am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraParameters.cpp | 2 |
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; |