From patchwork Fri Apr 5 23:58:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 929 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3A52D61111 for ; Sat, 6 Apr 2019 01:59:22 +0200 (CEST) X-Halon-ID: d2914f4b-57fe-11e9-8144-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id d2914f4b-57fe-11e9-8144-0050569116f7; Sat, 06 Apr 2019 01:59:19 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sat, 6 Apr 2019 01:58:38 +0200 Message-Id: <20190405235842.27884-5-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190405235842.27884-1-niklas.soderlund@ragnatech.se> References: <20190405235842.27884-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 4/8] libcamera: Make geometry.h a public header X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2019 23:59:22 -0000 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 --- {src/libcamera/include => include/libcamera}/geometry.h | 0 include/libcamera/meson.build | 1 + src/libcamera/geometry.cpp | 2 +- src/libcamera/include/formats.h | 2 +- src/libcamera/include/v4l2_subdevice.h | 3 ++- src/libcamera/v4l2_subdevice.cpp | 3 ++- test/v4l2_subdevice/list_formats.cpp | 3 ++- 7 files changed, 9 insertions(+), 5 deletions(-) rename {src/libcamera/include => include/libcamera}/geometry.h (100%) 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 -#include "geometry.h" +#include /** * \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 #include -#include "geometry.h" +#include 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 #include +#include + #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 -#include "geometry.h" +#include + #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 #include -#include "geometry.h" +#include + #include "v4l2_subdevice.h" #include "v4l2_subdevice_test.h"