From e77c8951e9ff91bf2bacf81791a882ccb3cee30b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 11 Aug 2021 19:34:44 +0300 Subject: libcamera: base: extensible: Pass private pointer as unique_ptr<> The Extensible constructor takes a pointer to a Private instance, whose lifetime it then manages. Make this explicit in the API by passing the pointer as a std::unique_ptr. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- src/android/camera_buffer.h | 2 +- src/android/camera_hal_config.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/android') diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index 21373fa2..c4e3a9e7 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -32,7 +32,7 @@ public: #define PUBLIC_CAMERA_BUFFER_IMPLEMENTATION \ CameraBuffer::CameraBuffer(buffer_handle_t camera3Buffer, int flags) \ - : Extensible(new Private(this, camera3Buffer, flags)) \ + : Extensible(std::make_unique(this, camera3Buffer, flags)) \ { \ } \ CameraBuffer::~CameraBuffer() \ diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp index 14549083..aa90dac7 100644 --- a/src/android/camera_hal_config.cpp +++ b/src/android/camera_hal_config.cpp @@ -341,7 +341,7 @@ int CameraHalConfig::Private::parseConfigFile(FILE *fh, } CameraHalConfig::CameraHalConfig() - : Extensible(new Private()), exists_(false), valid_(false) + : Extensible(std::make_unique()), exists_(false), valid_(false) { parseConfigurationFile(); } -- cgit v1.2.1