From 58f1ad3c79e56eca7d64449ee55d823efe86e213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= 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 Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- include/libcamera/geometry.h | 60 +++++++++++++++++++++++++++++++++++++++++++ include/libcamera/meson.build | 1 + 2 files changed, 61 insertions(+) create mode 100644 include/libcamera/geometry.h (limited to 'include') 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 + +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', -- cgit v1.2.1