{"id":9247,"url":"https://patchwork.libcamera.org/api/1.1/patches/9247/?format=json","web_url":"https://patchwork.libcamera.org/patch/9247/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200806125330.2983325-2-niklas.soderlund@ragnatech.se>","date":"2020-08-06T12:53:28","name":"[libcamera-devel,1/3] libcamera: pipeline_handler: Make cameraData() a const operation","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3866083e7bbe85dfddb7034ae3e14bd960ddcb92","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":{"id":16,"url":"https://patchwork.libcamera.org/api/1.1/users/16/?format=json","username":"neg","first_name":"Niklas","last_name":"Söderlund","email":"niklas.soderlund@ragnatech.se"},"mbox":"https://patchwork.libcamera.org/patch/9247/mbox/","series":[{"id":1203,"url":"https://patchwork.libcamera.org/api/1.1/series/1203/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1203","date":"2020-08-06T12:53:27","name":"libcamera: Mark controls and property accessors as const operations","version":1,"mbox":"https://patchwork.libcamera.org/series/1203/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9247/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9247/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BDB73BD87A\n\tfor ;\n\tThu, 6 Aug 2020 12:53:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7738F60901;\n\tThu, 6 Aug 2020 14:53:42 +0200 (CEST)","from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A149F60554\n\tfor ;\n\tThu, 6 Aug 2020 14:53:41 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid d9f3e071-d7e3-11ea-92dc-005056917a89;\n\tThu, 06 Aug 2020 14:53:40 +0200 (CEST)"],"X-Halon-ID":"d9f3e071-d7e3-11ea-92dc-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 6 Aug 2020 14:53:28 +0200","Message-Id":"<20200806125330.2983325-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200806125330.2983325-1-niklas.soderlund@ragnatech.se>","References":"<20200806125330.2983325-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/3] libcamera: pipeline_handler: Make\n\tcameraData() a const operation","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"There is nothing blocking cameraData() from being a constant operation.\nThe assert already enforces that a std::map::at() operation would always\nsucceed. Switch to using at() and mark the method as a const operation.\n\nSigned-off-by: Niklas Söderlund \n---\n include/libcamera/internal/pipeline_handler.h | 2 +-\n src/libcamera/pipeline_handler.cpp | 4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 22e629a8401d1e4e..d5321ef56df358d0 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -96,7 +96,7 @@ protected:\n \n \tvirtual int queueRequestDevice(Camera *camera, Request *request) = 0;\n \n-\tCameraData *cameraData(const Camera *camera);\n+\tCameraData *cameraData(const Camera *camera) const;\n \n \tCameraManager *manager_;\n \ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex ccd45edc847b9e3f..bc9c1d4b09c5437d 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -595,10 +595,10 @@ void PipelineHandler::disconnect()\n * valid until the pipeline handler is destroyed. It shall not be deleted\n * manually by the caller.\n */\n-CameraData *PipelineHandler::cameraData(const Camera *camera)\n+CameraData *PipelineHandler::cameraData(const Camera *camera) const\n {\n \tASSERT(cameraData_.count(camera));\n-\treturn cameraData_[camera].get();\n+\treturn cameraData_.at(camera).get();\n }\n \n /**\n","prefixes":["libcamera-devel","1/3"]}