From 58f1ad3c79e56eca7d64449ee55d823efe86e213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
Date: Thu, 4 Apr 2019 17:07:39 +0200
Subject: libcamera: Make geometry.h a public header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 include/libcamera/geometry.h           | 60 ++++++++++++++++++++++++++++++++++
 include/libcamera/meson.build          |  1 +
 src/libcamera/geometry.cpp             |  2 +-
 src/libcamera/include/formats.h        |  2 +-
 src/libcamera/include/geometry.h       | 60 ----------------------------------
 src/libcamera/include/v4l2_subdevice.h |  3 +-
 src/libcamera/v4l2_subdevice.cpp       |  3 +-
 test/v4l2_subdevice/list_formats.cpp   |  3 +-
 8 files changed, 69 insertions(+), 65 deletions(-)
 create mode 100644 include/libcamera/geometry.h
 delete mode 100644 src/libcamera/include/geometry.h

diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
new file mode 100644
index 00000000..f41017aa
--- /dev/null
+++ b/include/libcamera/geometry.h
@@ -0,0 +1,60 @@
+/* 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/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/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"
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"
 
-- 
cgit v1.2.1