| Message ID | 20190405235842.27884-5-niklas.soderlund@ragnatech.se |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
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/include/libcamera/meson.build b/include/libcamera/meson.build index 3f4d1e28208b1084..83d226ac5078bfc7 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -4,6 +4,7 @@ libcamera_api = files([ 'camera_manager.h', 'event_dispatcher.h', 'event_notifier.h', + 'geometry.h', 'libcamera.h', 'object.h', 'request.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"