[libcamera-devel] [PATCH v2 4/8] libcamera: Make geometry.h a public header
Niklas Söderlund
niklas.soderlund at ragnatech.se
Fri Apr 5 04:02:52 CEST 2019
Make the geometry header public so it can be used by the API facing
applications.
Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
---
{src/libcamera/include => include/libcamera}/geometry.h | 0
src/libcamera/geometry.cpp | 2 +-
src/libcamera/include/formats.h | 2 +-
src/libcamera/include/v4l2_subdevice.h | 3 ++-
src/libcamera/v4l2_subdevice.cpp | 3 ++-
test/v4l2_subdevice/list_formats.cpp | 3 ++-
6 files changed, 8 insertions(+), 5 deletions(-)
rename {src/libcamera/include => include/libcamera}/geometry.h (100%)
diff --git a/src/libcamera/include/geometry.h b/include/libcamera/geometry.h
similarity index 100%
rename from src/libcamera/include/geometry.h
rename to include/libcamera/geometry.h
diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp
index d0c63c353ab3fc0b..d63eceaf827b99a4 100644
--- a/src/libcamera/geometry.cpp
+++ b/src/libcamera/geometry.cpp
@@ -7,7 +7,7 @@
#include <sstream>
-#include "geometry.h"
+#include <libcamera/geometry.h>
/**
* \file geometry.h
diff --git a/src/libcamera/include/formats.h b/src/libcamera/include/formats.h
index 5fcfb11318e749d1..a73772b1eda068b4 100644
--- a/src/libcamera/include/formats.h
+++ b/src/libcamera/include/formats.h
@@ -11,7 +11,7 @@
#include <map>
#include <vector>
-#include "geometry.h"
+#include <libcamera/geometry.h>
namespace libcamera {
diff --git a/src/libcamera/include/v4l2_subdevice.h b/src/libcamera/include/v4l2_subdevice.h
index ee7c72468d21b83b..c71dce7d864494e5 100644
--- a/src/libcamera/include/v4l2_subdevice.h
+++ b/src/libcamera/include/v4l2_subdevice.h
@@ -11,8 +11,9 @@
#include <string>
#include <vector>
+#include <libcamera/geometry.h>
+
#include "formats.h"
-#include "geometry.h"
#include "log.h"
#include "media_object.h"
diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp
index 0abeaa204eda465b..e34cc1693b46b374 100644
--- a/src/libcamera/v4l2_subdevice.cpp
+++ b/src/libcamera/v4l2_subdevice.cpp
@@ -14,7 +14,8 @@
#include <linux/v4l2-subdev.h>
-#include "geometry.h"
+#include <libcamera/geometry.h>
+
#include "log.h"
#include "media_device.h"
#include "media_object.h"
diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp
index db486554b7b5c6a9..47ae3a1c1a28c350 100644
--- a/test/v4l2_subdevice/list_formats.cpp
+++ b/test/v4l2_subdevice/list_formats.cpp
@@ -9,7 +9,8 @@
#include <iostream>
#include <vector>
-#include "geometry.h"
+#include <libcamera/geometry.h>
+
#include "v4l2_subdevice.h"
#include "v4l2_subdevice_test.h"
--
2.21.0
More information about the libcamera-devel
mailing list