summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-04-04 17:07:39 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2019-04-05 21:47:34 +0200
commit58f1ad3c79e56eca7d64449ee55d823efe86e213 (patch)
tree5f7dd2cfe5cd0638440f183431e7898e1b1a1167 /src
parent024b4ea514466983f853fbbd6f571070679cde46 (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>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/geometry.cpp2
-rw-r--r--src/libcamera/include/formats.h2
-rw-r--r--src/libcamera/include/geometry.h60
-rw-r--r--src/libcamera/include/v4l2_subdevice.h3
-rw-r--r--src/libcamera/v4l2_subdevice.cpp3
5 files changed, 6 insertions, 64 deletions
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/geometry.h b/src/libcamera/include/geometry.h
deleted file mode 100644
index f41017aa..00000000
--- a/src/libcamera/include/geometry.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- * Copyright (C) 2019, Google Inc.
- *
- * geometry.h - Geometry-related structure
- */
-
-#ifndef __LIBCAMERA_GEOMETRY_H__
-#define __LIBCAMERA_GEOMETRY_H__
-
-#include <string>
-
-namespace libcamera {
-
-struct Rectangle {
- int x;
- int y;
- unsigned int w;
- unsigned int h;
-
- const std::string toString() const;
-};
-
-struct SizeRange {
- SizeRange()
- : SizeRange(0, 0, 0, 0)
- {
- }
-
- SizeRange(unsigned int minW, unsigned int minH,
- unsigned int maxW, unsigned int maxH)
- : minWidth(minW), minHeight(minH), maxWidth(maxW),
- maxHeight(maxH)
- {
- }
-
- unsigned int minWidth;
- unsigned int minHeight;
- unsigned int maxWidth;
- unsigned int maxHeight;
-};
-
-struct Size {
- Size()
- : Size(0, 0)
- {
- }
-
- Size(unsigned int w, unsigned int h)
- : width(w), height(h)
- {
- }
-
- unsigned int width;
- unsigned int height;
-};
-
-} /* namespace libcamera */
-
-#endif /* __LIBCAMERA_GEOMETRY_H__ */
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"