summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_buffer.h15
-rw-r--r--src/android/camera_hal_config.cpp3
2 files changed, 6 insertions, 12 deletions
diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h
index 2617ff6b..21373fa2 100644
--- a/src/android/camera_buffer.h
+++ b/src/android/camera_buffer.h
@@ -40,27 +40,22 @@ CameraBuffer::~CameraBuffer() \
} \
bool CameraBuffer::isValid() const \
{ \
- const Private *const d = LIBCAMERA_D_PTR(); \
- return d->isValid(); \
+ return _d()->isValid(); \
} \
unsigned int CameraBuffer::numPlanes() const \
{ \
- const Private *const d = LIBCAMERA_D_PTR(); \
- return d->numPlanes(); \
+ return _d()->numPlanes(); \
} \
Span<const uint8_t> CameraBuffer::plane(unsigned int plane) const \
{ \
- const Private *const d = LIBCAMERA_D_PTR(); \
- return const_cast<Private *>(d)->plane(plane); \
+ return const_cast<Private *>(_d())->plane(plane); \
} \
Span<uint8_t> CameraBuffer::plane(unsigned int plane) \
{ \
- Private *const d = LIBCAMERA_D_PTR(); \
- return d->plane(plane); \
+ return _d()->plane(plane); \
} \
size_t CameraBuffer::jpegBufferSize(size_t maxJpegBufferSize) const \
{ \
- const Private *const d = LIBCAMERA_D_PTR(); \
- return d->jpegBufferSize(maxJpegBufferSize); \
+ return _d()->jpegBufferSize(maxJpegBufferSize); \
}
#endif /* __ANDROID_CAMERA_BUFFER_H__ */
diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index d84de4fd..833cf4ba 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -375,8 +375,7 @@ int CameraHalConfig::parseConfigurationFile()
exists_ = true;
- Private *const d = LIBCAMERA_D_PTR();
- int ret = d->parseConfigFile(fh, &cameras_);
+ int ret = _d()->parseConfigFile(fh, &cameras_);
fclose(fh);
if (ret)
return -EINVAL;