diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-11-10 18:03:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-10 18:03:29 +0000 |
| commit | 874a9ba73289a542eb28063c985e639da4bd048f (patch) | |
| tree | 0f2f447ede57560c92ccc0894ef79c7654e7a313 | |
| parent | c973e079e4e38e40ab73bd82dda6d020c8d9938e (diff) | |
| parent | 6e2b3be539277ed0c25213e4598520ba5e9e5942 (diff) | |
| download | mako-874a9ba73289a542eb28063c985e639da4bd048f.tar.gz | |
Merge "Fix build with clang"
| -rw-r--r-- | camera/QCameraHWI_Parm.cpp | 8 | ||||
| -rw-r--r-- | camera/mm-camera-interface/mm_camera_stream.c | 2 | ||||
| -rw-r--r-- | camera/mm-camera-interface/mm_omx_jpeg_encoder.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/camera/QCameraHWI_Parm.cpp b/camera/QCameraHWI_Parm.cpp index 69c8d2b..40e8907 100644 --- a/camera/QCameraHWI_Parm.cpp +++ b/camera/QCameraHWI_Parm.cpp @@ -3250,7 +3250,7 @@ status_t QCameraHardwareInterface::setCaptureBurstExp() char burst_exp[PROPERTY_VALUE_MAX]; memset(burst_exp, 0, sizeof(burst_exp)); property_get("persist.capture.burst.exposures", burst_exp, ""); - if (NULL != burst_exp) + if (*burst_exp) mParameters.set("capture-burst-exposures", burst_exp); return NO_ERROR; } @@ -4062,7 +4062,7 @@ void QCameraHardwareInterface::initExifData(){ ALOGE("%s: getExifModel failed", __func__); } - if(mExifValues.dateTime) { + if(*mExifValues.dateTime) { addExifTag(EXIFTAGID_EXIF_DATE_TIME_ORIGINAL, EXIF_ASCII, 20, 1, (void *)mExifValues.dateTime); addExifTag(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED, EXIF_ASCII, @@ -4087,7 +4087,7 @@ void QCameraHardwareInterface::initExifData(){ if(mExifValues.mLatitude) { addExifTag(EXIFTAGID_GPS_LATITUDE, EXIF_RATIONAL, 3, 1, (void *)mExifValues.latitude); - if(mExifValues.latRef) { + if(*mExifValues.latRef) { addExifTag(EXIFTAGID_GPS_LATITUDE_REF, EXIF_ASCII, 2, 1, (void *)mExifValues.latRef); } @@ -4096,7 +4096,7 @@ void QCameraHardwareInterface::initExifData(){ if(mExifValues.mLongitude) { addExifTag(EXIFTAGID_GPS_LONGITUDE, EXIF_RATIONAL, 3, 1, (void *)mExifValues.longitude); - if(mExifValues.lonRef) { + if(*mExifValues.lonRef) { addExifTag(EXIFTAGID_GPS_LONGITUDE_REF, EXIF_ASCII, 2, 1, (void *)mExifValues.lonRef); } diff --git a/camera/mm-camera-interface/mm_camera_stream.c b/camera/mm-camera-interface/mm_camera_stream.c index 6fca2db..e7ee4b1 100644 --- a/camera/mm-camera-interface/mm_camera_stream.c +++ b/camera/mm-camera-interface/mm_camera_stream.c @@ -266,7 +266,7 @@ int32_t mm_camera_util_private_s_ctrl(int32_t fd, uint32_t id, int32_t value) memset(&v4l2_ioctl, 0, sizeof(v4l2_ioctl)); v4l2_ioctl.id = id; - v4l2_ioctl.ioctl_ptr = value; + v4l2_ioctl.ioctl_ptr = (void*)value; rc = ioctl (fd, MSM_CAM_V4L2_IOCTL_PRIVATE_S_CTRL, &v4l2_ioctl); if(rc) { diff --git a/camera/mm-camera-interface/mm_omx_jpeg_encoder.c b/camera/mm-camera-interface/mm_omx_jpeg_encoder.c index 2e628bf..a69140b 100644 --- a/camera/mm-camera-interface/mm_omx_jpeg_encoder.c +++ b/camera/mm-camera-interface/mm_omx_jpeg_encoder.c @@ -724,7 +724,7 @@ void omxJpegAbort() ALOGV("%s: encoding=%d", __func__, encoding); if (encoding) { encoding = 0; - OMX_SendCommand(pHandle, OMX_CommandFlush, NULL, NULL); + OMX_SendCommand(pHandle, OMX_CommandFlush, 0, NULL); ALOGV("%s:waitForEvent: OMX_CommandFlush", __func__); waitForEvent(OMX_EVENT_JPEG_ABORT, 0, 0); ALOGV("%s:waitForEvent: OMX_CommandFlush: DONE", __func__); |