From fc1fcb5bc9c21cc497bb978b866885787587aa9f Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Sat, 3 Oct 2020 13:17:35 +0200
Subject: android: camera_device: Return Camera as shared_ptr

Return the Camera wrapped by the CameraDevice as a shared_ptr.
This will be required to construct the FrameBuffer allocator in
the CameraStream class.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/android/camera_hal_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/android/camera_hal_manager.cpp')

diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp
index 05b47401..2a33f9b1 100644
--- a/src/android/camera_hal_manager.cpp
+++ b/src/android/camera_hal_manager.cpp
@@ -155,7 +155,7 @@ void CameraHalManager::cameraRemoved(std::shared_ptr<Camera> cam)
 
 	auto iter = std::find_if(cameras_.begin(), cameras_.end(),
 				 [&cam](std::shared_ptr<CameraDevice> &camera) {
-					 return cam.get() == camera->camera();
+					 return cam == camera->camera();
 				 });
 	if (iter == cameras_.end())
 		return;
-- 
cgit v1.2.1