diff options
| author | Colin Cross <ccross@android.com> | 2014-03-24 19:36:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 19:36:36 +0000 |
| commit | 32ce52b01dab863f2b4749e1c69f619cf820486f (patch) | |
| tree | 489e255200d3a7bfdac8269bee29a9b55707f14e /services/camera/libcameraservice/device2 | |
| parent | f555c47f1843b5a3557e18c16cb06b0ec06dcf34 (diff) | |
| parent | 5c679d41714e42f153f6aeb492df54510a195bc1 (diff) | |
| download | frameworks_av-32ce52b01dab863f2b4749e1c69f619cf820486f.zip frameworks_av-32ce52b01dab863f2b4749e1c69f619cf820486f.tar.gz frameworks_av-32ce52b01dab863f2b4749e1c69f619cf820486f.tar.bz2 | |
am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp
* commit '5c679d41714e42f153f6aeb492df54510a195bc1':
libcameraservice: build 64-bit
libcameraservice: fix 64-bit print format warnings
Diffstat (limited to 'services/camera/libcameraservice/device2')
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp index 9b0ad91..0cc3a04 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.cpp +++ b/services/camera/libcameraservice/device2/Camera2Device.cpp @@ -999,7 +999,7 @@ status_t Camera2Device::StreamAdapter::connectToDevice( return BAD_VALUE; } - ALOGV("%s: New stream parameters %d x %d, format 0x%x, size %d", + ALOGV("%s: New stream parameters %d x %d, format 0x%x, size %zu", __FUNCTION__, width, height, format, size); mConsumerInterface = consumer; @@ -1071,7 +1071,7 @@ status_t Camera2Device::StreamAdapter::connectToDevice( mSize, 1, mFormat); if (res != OK) { ALOGE("%s: Unable to configure compressed stream buffer geometry" - " %d x %d, size %d for stream %d", + " %d x %d, size %zu for stream %d", __FUNCTION__, mWidth, mHeight, mSize, mId); return res; } |