NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: camera_sensor: Store subdevice in std::unique_ptr

Browse source 
Avoid the need for a manual delete in the destructor by using a unique
pointer.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-05-02 16:17:31 +03:00
parent db7f214547
commit 3697c93a8d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libcamera/camera_sensor.cpp
View file

@ -133,7 +133,6 @@ LOG_DEFINE_CATEGORY(CameraSensor);
CameraSensor::CameraSensor(const MediaEntity *entity) CameraSensor::CameraSensor(const MediaEntity *entity)
: entity_(entity), properties_(properties::properties) : entity_(entity), properties_(properties::properties)
{ {
subdev_ = new V4L2Subdevice(entity);
} }
/** /**
@ -141,7 +140,6 @@ CameraSensor::CameraSensor(const MediaEntity *entity)
*/ */
CameraSensor::~CameraSensor() CameraSensor::~CameraSensor()
{ {
delete subdev_;
} }
/** /**
@ -197,7 +195,8 @@ int CameraSensor::init()
else else
model_ = entityName; model_ = entityName;
/* Open the subdev. */ /* Create and open the subdev. */
subdev_ = std::make_unique<V4L2Subdevice>(entity_);
ret = subdev_->open(); ret = subdev_->open();
if (ret < 0) if (ret < 0)
return ret; return ret;

3
src/libcamera/include/camera_sensor.h
View file

@ -7,6 +7,7 @@
#ifndef __LIBCAMERA_CAMERA_SENSOR_H__ #ifndef __LIBCAMERA_CAMERA_SENSOR_H__
#define __LIBCAMERA_CAMERA_SENSOR_H__ #define __LIBCAMERA_CAMERA_SENSOR_H__
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
@ -68,7 +69,7 @@ protected:
private: private:
const MediaEntity *entity_; const MediaEntity *entity_;
V4L2Subdevice *subdev_; std::unique_ptr<V4L2Subdevice> subdev_;
std::string model_; std::string model_;
std::vector<unsigned int> mbusCodes_; std::vector<unsigned int> mbusCodes_;