summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTommaso Merciai <tommaso.merciai@amarulasolutions.com>2022-06-13 10:27:25 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-06-17 13:22:45 +0300
commitf44ce70d9b8859c319e5c814584684ff61e3b6fa (patch)
tree915a518b5e2d2ebbbd079592ef0fbe1b5f466fae
parent71bdc1e441eba73ad80272573503445648d5ea9c (diff)
Documentation: Fix createRequest unique_ptr
camera->createRequest() function return std::unique_ptr<Request>, then manipulate Request as std::unique_ptr. This solve the following error, during compilation: error: cannot convert ‘std::unique_ptr<libcamera::Request>’ to ‘libcamera::Request*’ in initialization References: - https://github.com/kbingham/simple-cam/blob/bb97f3bbd96a9d347e1b7f6cb68d94efaf8db574/simple-cam.cpp#L369 Signed-off-by: Tommaso Merciai <tommaso.merciai@amarulasolutions.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--Documentation/guides/application-developer.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/guides/application-developer.rst b/Documentation/guides/application-developer.rst
index 16bea9c4..8d12a208 100644
--- a/Documentation/guides/application-developer.rst
+++ b/Documentation/guides/application-developer.rst
@@ -308,7 +308,7 @@ the camera.
Stream *stream = streamConfig.stream();
const std::vector<std::unique_ptr<FrameBuffer>> &buffers = allocator->buffers(stream);
- std::vector<Request *> requests;
+ std::vector<std::unique_ptr<Request>> requests;
Proceed to fill the request vector by creating ``Request`` instances from the
camera device, and associate a buffer for each of them for the ``Stream``.
@@ -316,7 +316,7 @@ camera device, and associate a buffer for each of them for the ``Stream``.
.. code:: cpp
for (unsigned int i = 0; i < buffers.size(); ++i) {
- Request *request = camera->createRequest();
+ std::unique_ptr<Request> request = camera->createRequest();
if (!request)
{
std::cerr << "Can't create request" << std::endl;
@@ -332,7 +332,7 @@ camera device, and associate a buffer for each of them for the ``Stream``.
return ret;
}
- requests.push_back(request);
+ requests.push_back(std::move(request));
}
.. TODO: Controls
@@ -517,8 +517,8 @@ and queue all the previously created requests.
.. code:: cpp
camera->start();
- for (Request *request : requests)
- camera->queueRequest(request);
+ for (std::unique_ptr<Request> &request : requests)
+ camera->queueRequest(request.get());
Start an event loop
~~~~~~~~~~~~~~~~~~~