diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-04-04 17:07:39 +0200 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2019-04-05 21:47:34 +0200 |
| commit | 58f1ad3c79e56eca7d64449ee55d823efe86e213 (patch) | |
| tree | 5f7dd2cfe5cd0638440f183431e7898e1b1a1167 | |
| parent | 024b4ea514466983f853fbbd6f571070679cde46 (diff) | |
libcamera: Make geometry.h a public header
Make the geometry header public so it can be used by the API facing
applications.
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rw-r--r-- | include/libcamera/geometry.h (renamed from src/libcamera/include/geometry.h) | 0 | ||||
| -rw-r--r-- | include/libcamera/meson.build | 1 | ||||
| -rw-r--r-- | src/libcamera/geometry.cpp | 2 | ||||
| -rw-r--r-- | src/libcamera/include/formats.h | 2 | ||||
| -rw-r--r-- | src/libcamera/include/v4l2_subdevice.h | 3 | ||||
| -rw-r--r-- | src/libcamera/v4l2_subdevice.cpp | 3 | ||||
| -rw-r--r-- | test/v4l2_subdevice/list_formats.cpp | 3 |
7 files changed, 9 insertions, 5 deletions
diff --git a/src/libcamera/include/geometry.h b/include/libcamera/geometry.h index f41017aa..f41017aa 100644 --- a/src/libcamera/include/geometry.h +++ b/include/libcamera/geometry.h diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 3f4d1e28..83d226ac 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 d0c63c35..d63eceaf 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 5fcfb113..a73772b1 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 ee7c7246..c71dce7d 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 0abeaa20..e34cc169 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 db486554..47ae3a1c 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" |