{"id":349,"url":"https://patchwork.libcamera.org/api/patches/349/?format=json","web_url":"https://patchwork.libcamera.org/patch/349/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20190123112957.25580-1-niklas.soderlund@ragnatech.se>","date":"2019-01-23T11:29:57","name":"[libcamera-devel] libcamera: fix odd include file hierarchy","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"cb82e52e4022e3d98e308b4527467d0edfa122c3","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/349/mbox/","series":[{"id":121,"url":"https://patchwork.libcamera.org/api/series/121/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=121","date":"2019-01-23T11:29:57","name":"[libcamera-devel] libcamera: fix odd include file hierarchy","version":1,"mbox":"https://patchwork.libcamera.org/series/121/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/349/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/349/checks/","tags":{},"headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F376560C7D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 23 Jan 2019 12:30:07 +0100 (CET)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 2a987948-1f02-11e9-911a-0050569116f7;\n\tWed, 23 Jan 2019 12:29:42 +0100 (CET)"],"X-Halon-ID":"2a987948-1f02-11e9-911a-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 23 Jan 2019 12:29:57 +0100","Message-Id":"<20190123112957.25580-1-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.20.1","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: fix odd include file hierarchy","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Wed, 23 Jan 2019 11:30:08 -0000"},"content":"There is no need for pipeline_handler.h to include camera.h, instead it\nshould be included in the source file which needs it;\ncamera_manager.cpp. Fix this by adding a forward declaration of Camera\nin pipeline_handler.h and include the header in the correct file.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/camera_manager.cpp         | 1 +\n src/libcamera/include/pipeline_handler.h | 3 +--\n 2 files changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 37ccbd533790856a..4ea7ed44cc31f747 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -5,6 +5,7 @@\n  * camera_manager.h - Camera management\n  */\n \n+#include <libcamera/camera.h>\n #include <libcamera/camera_manager.h>\n #include <libcamera/event_dispatcher.h>\n \ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex f05f201f7ca824eb..87dc3debd795eb3e 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -11,10 +11,9 @@\n #include <string>\n #include <vector>\n \n-#include <libcamera/camera.h>\n-\n namespace libcamera {\n \n+class Camera;\n class CameraManager;\n class DeviceEnumerator;\n \n","prefixes":["libcamera-devel"]}