summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-01-23 12:27:52 +0100
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-01-23 16:59:12 +0100
commitd32dc0c1c85325926d20044141d5b9850b9433fd (patch)
tree468e17d4341db23620d0db0a9189da9a5fe7c23c
parent6b546603acea401854f532f57ca5ff66341700ec (diff)
libcamera: fix odd include file hierarchy
There is no need for pipeline_handler.h to include camera.h, instead it should be included in the source file which needs it; camera_manager.cpp. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/libcamera/camera_manager.cpp1
-rw-r--r--src/libcamera/include/pipeline_handler.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 37ccbd53..4ea7ed44 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -5,6 +5,7 @@
* camera_manager.h - Camera management
*/
+#include <libcamera/camera.h>
#include <libcamera/camera_manager.h>
#include <libcamera/event_dispatcher.h>
diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
index f05f201f..b03217d5 100644
--- a/src/libcamera/include/pipeline_handler.h
+++ b/src/libcamera/include/pipeline_handler.h
@@ -11,8 +11,6 @@
#include <string>
#include <vector>
-#include <libcamera/camera.h>
-
namespace libcamera {
class CameraManager;