From 3129fcae43ce139cb1e158cb5255428afb8952ec Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 9 Dec 2020 13:13:38 +0200 Subject: libcamera: pipeline: Manage resources with std::unique_ptr<> Replace manual resource destruction with std::unique_ptr<> where applicable. This removes the need for several destructors. Signed-off-by: Laurent Pinchart Reviewed-by: Paul Elder --- src/libcamera/pipeline/vimc/vimc.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/libcamera/pipeline/vimc') diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 72256f5b..8bda746f 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -42,20 +42,15 @@ class VimcCameraData : public CameraData { public: VimcCameraData(PipelineHandler *pipe, MediaDevice *media) - : CameraData(pipe), media_(media), sensor_(nullptr) + : CameraData(pipe), media_(media) { } - ~VimcCameraData() - { - delete sensor_; - } - int init(); void bufferReady(FrameBuffer *buffer); MediaDevice *media_; - CameraSensor *sensor_; + std::unique_ptr sensor_; std::unique_ptr debayer_; std::unique_ptr scaler_; std::unique_ptr video_; @@ -461,7 +456,7 @@ int VimcCameraData::init() return ret; /* Create and open the camera sensor, debayer, scaler and video device. */ - sensor_ = new CameraSensor(media_->getEntityByName("Sensor B")); + sensor_ = std::make_unique(media_->getEntityByName("Sensor B")); ret = sensor_->init(); if (ret) return ret; -- cgit v1.2.1