diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-05-15 19:01:30 +0300 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2020-05-16 03:38:47 +0300 |
commit | f934fd1cb9371dc49e32aee061284a2dadd8ea89 (patch) | |
tree | f5d48eb40eff616cf206ca66191b6b8a9984c48c /include/libcamera/internal | |
parent | 93e72b695e477ac1efc22a0bdddb177199cf2fb9 (diff) |
libcamera: Move IPA headers from include/ipa/ to include/libcamera/ipa/
The IPA headers are installed into $prefix/include/libcamera/ipa/, but
are located in the source tree in include/ipa/. This requires files
within libcamera to include them with
#include <ipa/foo.h>
while a third party IPA would need to use
#include <libcamera/ipa/foo.h>
Not only is this inconsistent, it can create issues later if IPA headers
need to include each other, as the first form of include directive
wouldn't be valid once the headers are installed.
Fix the problem by moving the IPA headers to include/libcamera/ipa/.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include/libcamera/internal')
-rw-r--r-- | include/libcamera/internal/ipa_context_wrapper.h | 2 | ||||
-rw-r--r-- | include/libcamera/internal/ipa_manager.h | 4 | ||||
-rw-r--r-- | include/libcamera/internal/ipa_module.h | 4 | ||||
-rw-r--r-- | include/libcamera/internal/ipa_proxy.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h index a717d406..bd770e13 100644 --- a/include/libcamera/internal/ipa_context_wrapper.h +++ b/include/libcamera/internal/ipa_context_wrapper.h @@ -7,7 +7,7 @@ #ifndef __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__ #define __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__ -#include <ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_interface.h> #include "libcamera/internal/control_serializer.h" diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h index f07d91fc..2412d757 100644 --- a/include/libcamera/internal/ipa_manager.h +++ b/include/libcamera/internal/ipa_manager.h @@ -10,8 +10,8 @@ #include <stdint.h> #include <vector> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/pipeline_handler.h" diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h index 2f569db0..5b54cb31 100644 --- a/include/libcamera/internal/ipa_module.h +++ b/include/libcamera/internal/ipa_module.h @@ -11,8 +11,8 @@ #include <string> #include <vector> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" diff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h index 1111065b..e9a36608 100644 --- a/include/libcamera/internal/ipa_proxy.h +++ b/include/libcamera/internal/ipa_proxy.h @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include <ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_interface.h> namespace libcamera { |