summaryrefslogtreecommitdiffstats
path: root/camera/CameraParameters.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-06-11 18:18:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-11 18:18:54 +0000
commit6415ef3f791a0f4032af250e3b5e11f0e6289a2e (patch)
tree2ec32686933602cfeecc52556d0104ebd27b47d6 /camera/CameraParameters.cpp
parent6b8f47f224534952c12628cbc382f10a5ade5b4f (diff)
parentdd80baf5413e3fb5ce5e1282ce9c0badd0b081f1 (diff)
downloadframeworks_av-6415ef3f791a0f4032af250e3b5e11f0e6289a2e.zip
frameworks_av-6415ef3f791a0f4032af250e3b5e11f0e6289a2e.tar.gz
frameworks_av-6415ef3f791a0f4032af250e3b5e11f0e6289a2e.tar.bz2
am dd80baf5: am 1f15b117: Merge "libcamera_client: 64-bit compile issue"
* commit 'dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1': libcamera_client: 64-bit compile issue
Diffstat (limited to 'camera/CameraParameters.cpp')
-rw-r--r--camera/CameraParameters.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 161f842..25d632d 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -457,7 +457,7 @@ const char *CameraParameters::getPictureFormat() const
void CameraParameters::dump() const
{
- ALOGD("dump: mMap.size = %d", mMap.size());
+ ALOGD("dump: mMap.size = %zu", mMap.size());
for (size_t i = 0; i < mMap.size(); i++) {
String8 k, v;
k = mMap.keyAt(i);
@@ -466,7 +466,7 @@ void CameraParameters::dump() const
}
}
-status_t CameraParameters::dump(int fd, const Vector<String16>& args) const
+status_t CameraParameters::dump(int fd, const Vector<String16>& /*args*/) const
{
const size_t SIZE = 256;
char buffer[SIZE];