From 600fd0e501a95809958c6a4f59edcb5d6388e399 Mon Sep 17 00:00:00 2001 From: Michael Platings Date: Mon, 12 Feb 2024 14:49:37 +0000 Subject: [PATCH] Move headers to intrinsiccv directory This reduces the likelihood of common headers like "utils.h" conflicting with headers from other projects. Also take the opportunity to consistently use double-quoted includes instead of angle-bracket includes, since the latter is typically used for system headers. --- adapters/opencv/intrinsiccv_hal.cpp | 2 +- adapters/opencv/intrinsiccv_hal.h | 2 +- intrinsiccv/CMakeLists.txt | 2 +- .../include/{ => intrinsiccv}/arithmetics/transpose.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/config.h | 0 intrinsiccv/include/{ => intrinsiccv}/containers/stack.h | 6 +++--- .../include/{ => intrinsiccv}/conversions/gray_to_rgb.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/conversions/merge.h | 2 +- .../include/{ => intrinsiccv}/conversions/rgb_to_rgb.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/conversions/split.h | 2 +- .../include/{ => intrinsiccv}/conversions/yuv_to_rgb.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/ctypes.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/debug.h | 6 +++--- intrinsiccv/include/{ => intrinsiccv}/dispatch.h | 2 +- .../include/{ => intrinsiccv}/filters/gaussian_blur.h | 4 ++-- intrinsiccv/include/{ => intrinsiccv}/filters/sobel.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/intrinsiccv.h | 4 ++-- .../include/{ => intrinsiccv}/morphology/workspace.h | 6 +++--- intrinsiccv/include/{ => intrinsiccv}/neon.h | 8 ++++---- intrinsiccv/include/{ => intrinsiccv}/neon_intrinsics.h | 0 intrinsiccv/include/{ => intrinsiccv}/operations.h | 4 ++-- intrinsiccv/include/{ => intrinsiccv}/resize/resize.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/sve2.h | 6 +++--- intrinsiccv/include/{ => intrinsiccv}/traits.h | 2 +- intrinsiccv/include/{ => intrinsiccv}/types.h | 6 +++--- intrinsiccv/include/{ => intrinsiccv}/unsafe.h | 0 intrinsiccv/include/{ => intrinsiccv}/utils.h | 4 ++-- intrinsiccv/include/{ => intrinsiccv}/workspace/borders.h | 2 +- .../include/{ => intrinsiccv}/workspace/separable.h | 4 ++-- intrinsiccv/src/analysis/canny_neon.cpp | 6 +++--- intrinsiccv/src/analysis/count_nonzeros_neon.cpp | 4 ++-- intrinsiccv/src/analysis/min_max_api.cpp | 6 +++--- intrinsiccv/src/analysis/min_max_loc_neon.cpp | 4 ++-- intrinsiccv/src/analysis/min_max_neon.cpp | 4 ++-- intrinsiccv/src/arithmetics/absdiff_api.cpp | 6 +++--- intrinsiccv/src/arithmetics/absdiff_neon.cpp | 4 ++-- intrinsiccv/src/arithmetics/absdiff_sme2.cpp | 4 ++-- intrinsiccv/src/arithmetics/absdiff_sve2.cpp | 4 ++-- .../src/arithmetics/add_abs_with_threshold_api.cpp | 6 +++--- .../src/arithmetics/add_abs_with_threshold_neon.cpp | 4 ++-- intrinsiccv/src/arithmetics/add_abs_with_threshold_sc.h | 4 ++-- intrinsiccv/src/arithmetics/add_api.cpp | 6 +++--- intrinsiccv/src/arithmetics/add_neon.cpp | 4 ++-- intrinsiccv/src/arithmetics/add_sme2.cpp | 4 ++-- intrinsiccv/src/arithmetics/add_sve2.cpp | 4 ++-- intrinsiccv/src/arithmetics/multiply_api.cpp | 6 +++--- intrinsiccv/src/arithmetics/multiply_neon.cpp | 6 +++--- intrinsiccv/src/arithmetics/multiply_sve2.cpp | 4 ++-- intrinsiccv/src/arithmetics/scale_api.cpp | 6 +++--- intrinsiccv/src/arithmetics/scale_neon.cpp | 4 ++-- intrinsiccv/src/arithmetics/sub_api.cpp | 4 ++-- intrinsiccv/src/arithmetics/sub_neon.cpp | 4 ++-- intrinsiccv/src/arithmetics/sub_sme2.cpp | 4 ++-- intrinsiccv/src/arithmetics/sub_sve2.cpp | 4 ++-- intrinsiccv/src/arithmetics/threshold_api.cpp | 4 ++-- intrinsiccv/src/arithmetics/threshold_neon.cpp | 4 ++-- intrinsiccv/src/arithmetics/threshold_sc.h | 4 ++-- intrinsiccv/src/arithmetics/transpose_api.cpp | 6 +++--- intrinsiccv/src/arithmetics/transpose_neon.cpp | 6 +++--- intrinsiccv/src/conversions/gray_to_rgb_api.cpp | 6 +++--- intrinsiccv/src/conversions/gray_to_rgb_neon.cpp | 6 +++--- intrinsiccv/src/conversions/gray_to_rgb_sc.h | 6 +++--- intrinsiccv/src/conversions/merge_api.cpp | 6 +++--- intrinsiccv/src/conversions/merge_neon.cpp | 6 +++--- intrinsiccv/src/conversions/rgb_to_rgb_api.cpp | 8 ++++---- intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp | 6 +++--- intrinsiccv/src/conversions/rgb_to_rgb_sc.h | 6 +++--- intrinsiccv/src/conversions/split_api.cpp | 6 +++--- intrinsiccv/src/conversions/split_neon.cpp | 6 +++--- intrinsiccv/src/conversions/yuv_to_rgb_api.cpp | 6 +++--- intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp | 6 +++--- intrinsiccv/src/conversions/yuv_to_rgb_sc.h | 6 +++--- intrinsiccv/src/filters/gaussian_blur_api.cpp | 8 ++++---- intrinsiccv/src/filters/gaussian_blur_neon.cpp | 6 +++--- intrinsiccv/src/filters/gaussian_blur_sc.h | 4 ++-- intrinsiccv/src/filters/gaussian_blur_sme2.cpp | 2 +- intrinsiccv/src/filters/gaussian_blur_sve2.cpp | 2 +- intrinsiccv/src/filters/sobel_api.cpp | 6 +++--- intrinsiccv/src/filters/sobel_neon.cpp | 8 ++++---- intrinsiccv/src/filters/sobel_sc.h | 6 +++--- intrinsiccv/src/morphology/morphology_api.cpp | 6 +++--- intrinsiccv/src/morphology/morphology_neon.cpp | 8 ++++---- intrinsiccv/src/morphology/morphology_sc.h | 8 ++++---- intrinsiccv/src/resize/resize_api.cpp | 6 +++--- intrinsiccv/src/resize/resize_neon.cpp | 6 +++--- intrinsiccv/src/resize/resize_sc.h | 4 ++-- intrinsiccv/src/resize/resize_sme2.cpp | 2 +- intrinsiccv/src/resize/resize_sve2.cpp | 2 +- test/api/test_canny.cpp | 2 +- test/api/test_count_nonzeros.cpp | 2 +- test/api/test_gaussian_blur.cpp | 2 +- test/api/test_merge.cpp | 2 +- test/api/test_min_max.cpp | 2 +- test/api/test_morphology.cpp | 2 +- test/api/test_resize_to_quarter.cpp | 2 +- test/api/test_rgb_and_gray.cpp | 2 +- test/api/test_saturating_absdiff.cpp | 2 +- test/api/test_saturating_add.cpp | 2 +- test/api/test_saturating_multiply.cpp | 2 +- test/api/test_saturating_sub.cpp | 2 +- test/api/test_scale.cpp | 2 +- test/api/test_sobel.cpp | 2 +- test/api/test_split.cpp | 2 +- test/api/test_threshold_binary.cpp | 2 +- test/api/test_transpose.cpp | 2 +- test/api/test_yuv_to_rgb.cpp | 2 +- test/framework/border.h | 3 +-- test/framework/kernel.h | 2 +- test/framework/test_kernel.cpp | 2 +- test/framework/utils.h | 2 +- 110 files changed, 218 insertions(+), 219 deletions(-) rename intrinsiccv/include/{ => intrinsiccv}/arithmetics/transpose.h (95%) rename intrinsiccv/include/{ => intrinsiccv}/config.h (100%) rename intrinsiccv/include/{ => intrinsiccv}/containers/stack.h (98%) rename intrinsiccv/include/{ => intrinsiccv}/conversions/gray_to_rgb.h (97%) rename intrinsiccv/include/{ => intrinsiccv}/conversions/merge.h (94%) rename intrinsiccv/include/{ => intrinsiccv}/conversions/rgb_to_rgb.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/conversions/split.h (95%) rename intrinsiccv/include/{ => intrinsiccv}/conversions/yuv_to_rgb.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/ctypes.h (98%) rename intrinsiccv/include/{ => intrinsiccv}/debug.h (95%) rename intrinsiccv/include/{ => intrinsiccv}/dispatch.h (98%) rename intrinsiccv/include/{ => intrinsiccv}/filters/gaussian_blur.h (97%) rename intrinsiccv/include/{ => intrinsiccv}/filters/sobel.h (98%) rename intrinsiccv/include/{ => intrinsiccv}/intrinsiccv.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/morphology/workspace.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/neon.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/neon_intrinsics.h (100%) rename intrinsiccv/include/{ => intrinsiccv}/operations.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/resize/resize.h (97%) rename intrinsiccv/include/{ => intrinsiccv}/sve2.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/traits.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/types.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/unsafe.h (100%) rename intrinsiccv/include/{ => intrinsiccv}/utils.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/workspace/borders.h (99%) rename intrinsiccv/include/{ => intrinsiccv}/workspace/separable.h (99%) diff --git a/adapters/opencv/intrinsiccv_hal.cpp b/adapters/opencv/intrinsiccv_hal.cpp index cb75119b1..12936a35d 100644 --- a/adapters/opencv/intrinsiccv_hal.cpp +++ b/adapters/opencv/intrinsiccv_hal.cpp @@ -9,7 +9,7 @@ #include #include -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" #include "opencv2/imgproc/hal/interface.h" namespace intrinsiccv::hal { diff --git a/adapters/opencv/intrinsiccv_hal.h b/adapters/opencv/intrinsiccv_hal.h index d296de861..c6cba2ff2 100644 --- a/adapters/opencv/intrinsiccv_hal.h +++ b/adapters/opencv/intrinsiccv_hal.h @@ -8,7 +8,7 @@ #include #include -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" #include "opencv2/core/hal/interface.h" // Forward declarations of OpenCV internals. diff --git a/intrinsiccv/CMakeLists.txt b/intrinsiccv/CMakeLists.txt index 6f5b6c55d..de7a5473d 100644 --- a/intrinsiccv/CMakeLists.txt +++ b/intrinsiccv/CMakeLists.txt @@ -78,7 +78,7 @@ set(INTRINSICCV_WARNING_FLAGS set(INTRINSICCV_SDL_FLAGS "-include" - "unsafe.h" + "intrinsiccv/unsafe.h" ) set(INTRINSICCV_CLANG_FLAGS diff --git a/intrinsiccv/include/arithmetics/transpose.h b/intrinsiccv/include/intrinsiccv/arithmetics/transpose.h similarity index 95% rename from intrinsiccv/include/arithmetics/transpose.h rename to intrinsiccv/include/intrinsiccv/arithmetics/transpose.h index 2fdac909e..8b3d2b135 100644 --- a/intrinsiccv/include/arithmetics/transpose.h +++ b/intrinsiccv/include/intrinsiccv/arithmetics/transpose.h @@ -8,7 +8,7 @@ #include #include -#include "ctypes.h" +#include "intrinsiccv/ctypes.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/config.h b/intrinsiccv/include/intrinsiccv/config.h similarity index 100% rename from intrinsiccv/include/config.h rename to intrinsiccv/include/intrinsiccv/config.h diff --git a/intrinsiccv/include/containers/stack.h b/intrinsiccv/include/intrinsiccv/containers/stack.h similarity index 98% rename from intrinsiccv/include/containers/stack.h rename to intrinsiccv/include/intrinsiccv/containers/stack.h index 58645446c..52c346434 100644 --- a/intrinsiccv/include/containers/stack.h +++ b/intrinsiccv/include/intrinsiccv/containers/stack.h @@ -9,9 +9,9 @@ #include #include -#include "config.h" -#include "traits.h" -#include "utils.h" +#include "intrinsiccv/config.h" +#include "intrinsiccv/traits.h" +#include "intrinsiccv/utils.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/conversions/gray_to_rgb.h b/intrinsiccv/include/intrinsiccv/conversions/gray_to_rgb.h similarity index 97% rename from intrinsiccv/include/conversions/gray_to_rgb.h rename to intrinsiccv/include/intrinsiccv/conversions/gray_to_rgb.h index 3f2725cf4..38293be88 100644 --- a/intrinsiccv/include/conversions/gray_to_rgb.h +++ b/intrinsiccv/include/intrinsiccv/conversions/gray_to_rgb.h @@ -5,7 +5,7 @@ #ifndef INTRINSICCV_CONVERSIONS_GRAY_TO_RGB_H #define INTRINSICCV_CONVERSIONS_GRAY_TO_RGB_H -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/conversions/merge.h b/intrinsiccv/include/intrinsiccv/conversions/merge.h similarity index 94% rename from intrinsiccv/include/conversions/merge.h rename to intrinsiccv/include/intrinsiccv/conversions/merge.h index 7043a4fa2..6c46dfab9 100644 --- a/intrinsiccv/include/conversions/merge.h +++ b/intrinsiccv/include/intrinsiccv/conversions/merge.h @@ -5,7 +5,7 @@ #ifndef INTRINSICCV_CONVERSIONS_MERGE_H #define INTRINSICCV_CONVERSIONS_MERGE_H -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/conversions/rgb_to_rgb.h b/intrinsiccv/include/intrinsiccv/conversions/rgb_to_rgb.h similarity index 99% rename from intrinsiccv/include/conversions/rgb_to_rgb.h rename to intrinsiccv/include/intrinsiccv/conversions/rgb_to_rgb.h index 15d84cd1f..4930a6d61 100644 --- a/intrinsiccv/include/conversions/rgb_to_rgb.h +++ b/intrinsiccv/include/intrinsiccv/conversions/rgb_to_rgb.h @@ -5,7 +5,7 @@ #ifndef INTRINSICCV_CONVERSIONS_RGB_TO_RGB_H #define INTRINSICCV_CONVERSIONS_RGB_TO_RGB_H -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/conversions/split.h b/intrinsiccv/include/intrinsiccv/conversions/split.h similarity index 95% rename from intrinsiccv/include/conversions/split.h rename to intrinsiccv/include/intrinsiccv/conversions/split.h index 93493e8f5..16f5761e5 100644 --- a/intrinsiccv/include/conversions/split.h +++ b/intrinsiccv/include/intrinsiccv/conversions/split.h @@ -7,7 +7,7 @@ #include -#include "ctypes.h" +#include "intrinsiccv/ctypes.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/conversions/yuv_to_rgb.h b/intrinsiccv/include/intrinsiccv/conversions/yuv_to_rgb.h similarity index 99% rename from intrinsiccv/include/conversions/yuv_to_rgb.h rename to intrinsiccv/include/intrinsiccv/conversions/yuv_to_rgb.h index 82fb44705..935bd9ee0 100644 --- a/intrinsiccv/include/conversions/yuv_to_rgb.h +++ b/intrinsiccv/include/intrinsiccv/conversions/yuv_to_rgb.h @@ -5,7 +5,7 @@ #ifndef INTRINSICCV_CONVERSIONS_YUV_TO_RGB_H #define INTRINSICCV_CONVERSIONS_YUV_TO_RGB_H -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/ctypes.h b/intrinsiccv/include/intrinsiccv/ctypes.h similarity index 98% rename from intrinsiccv/include/ctypes.h rename to intrinsiccv/include/intrinsiccv/ctypes.h index 32ed71329..d464a8625 100644 --- a/intrinsiccv/include/ctypes.h +++ b/intrinsiccv/include/intrinsiccv/ctypes.h @@ -17,7 +17,7 @@ #include "stddef.h" #endif // __cplusplus -#include +#include "intrinsiccv/config.h" /// IntrinsicCV error types typedef enum INTRINSICCV_NODISCARD { diff --git a/intrinsiccv/include/debug.h b/intrinsiccv/include/intrinsiccv/debug.h similarity index 95% rename from intrinsiccv/include/debug.h rename to intrinsiccv/include/intrinsiccv/debug.h index 185976c47..e3994aa07 100644 --- a/intrinsiccv/include/debug.h +++ b/intrinsiccv/include/intrinsiccv/debug.h @@ -5,11 +5,11 @@ #ifndef INTRINSICCV_DEBUG_H #define INTRINSICCV_DEBUG_H -#include "config.h" +#include "intrinsiccv/config.h" #if INTRINSICCV_TARGET_NEON -#include "neon.h" +#include "intrinsiccv/neon.h" #elif INTRINSICCV_TARGET_SVE2 -#include "sve2.h" +#include "intrinsiccv/sve2.h" #endif #include diff --git a/intrinsiccv/include/dispatch.h b/intrinsiccv/include/intrinsiccv/dispatch.h similarity index 98% rename from intrinsiccv/include/dispatch.h rename to intrinsiccv/include/intrinsiccv/dispatch.h index c2df7160f..1147cd4e5 100644 --- a/intrinsiccv/include/dispatch.h +++ b/intrinsiccv/include/intrinsiccv/dispatch.h @@ -7,7 +7,7 @@ #include -#include "config.h" +#include "intrinsiccv/config.h" #include "sys/ifunc.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/filters/gaussian_blur.h b/intrinsiccv/include/intrinsiccv/filters/gaussian_blur.h similarity index 97% rename from intrinsiccv/include/filters/gaussian_blur.h rename to intrinsiccv/include/intrinsiccv/filters/gaussian_blur.h index 301c6e7eb..a459fe91c 100644 --- a/intrinsiccv/include/filters/gaussian_blur.h +++ b/intrinsiccv/include/intrinsiccv/filters/gaussian_blur.h @@ -5,8 +5,8 @@ #ifndef INTRINSICCV_FILTERS_GAUSSIAN_BLUR_H #define INTRINSICCV_FILTERS_GAUSSIAN_BLUR_H -#include "config.h" -#include "types.h" +#include "intrinsiccv/config.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/filters/sobel.h b/intrinsiccv/include/intrinsiccv/filters/sobel.h similarity index 98% rename from intrinsiccv/include/filters/sobel.h rename to intrinsiccv/include/intrinsiccv/filters/sobel.h index 01620853a..238679aa3 100644 --- a/intrinsiccv/include/filters/sobel.h +++ b/intrinsiccv/include/intrinsiccv/filters/sobel.h @@ -5,7 +5,7 @@ #ifndef INTRINSICCV_FILTERS_SOBEL_H #define INTRINSICCV_FILTERS_SOBEL_H -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/intrinsiccv.h b/intrinsiccv/include/intrinsiccv/intrinsiccv.h similarity index 99% rename from intrinsiccv/include/intrinsiccv.h rename to intrinsiccv/include/intrinsiccv/intrinsiccv.h index a2804f1b6..567fbe859 100644 --- a/intrinsiccv/include/intrinsiccv.h +++ b/intrinsiccv/include/intrinsiccv/intrinsiccv.h @@ -17,8 +17,8 @@ #ifndef INTRINSICCV_H #define INTRINSICCV_H -#include "config.h" -#include "ctypes.h" +#include "intrinsiccv/config.h" +#include "intrinsiccv/ctypes.h" #ifdef __cplusplus extern "C" { diff --git a/intrinsiccv/include/morphology/workspace.h b/intrinsiccv/include/intrinsiccv/morphology/workspace.h similarity index 99% rename from intrinsiccv/include/morphology/workspace.h rename to intrinsiccv/include/intrinsiccv/morphology/workspace.h index 00335c383..0c5d7f3e4 100644 --- a/intrinsiccv/include/morphology/workspace.h +++ b/intrinsiccv/include/intrinsiccv/morphology/workspace.h @@ -9,11 +9,11 @@ #include #include -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" #if INTRINSICCV_TARGET_SME2 -#include "sve2.h" +#include "intrinsiccv/sve2.h" #endif namespace intrinsiccv { diff --git a/intrinsiccv/include/neon.h b/intrinsiccv/include/intrinsiccv/neon.h similarity index 99% rename from intrinsiccv/include/neon.h rename to intrinsiccv/include/intrinsiccv/neon.h index 6f17e8e0e..9030483a7 100644 --- a/intrinsiccv/include/neon.h +++ b/intrinsiccv/include/intrinsiccv/neon.h @@ -7,10 +7,10 @@ #include -#include "neon_intrinsics.h" -#include "operations.h" -#include "utils.h" -#include "workspace/separable.h" +#include "intrinsiccv/neon_intrinsics.h" +#include "intrinsiccv/operations.h" +#include "intrinsiccv/utils.h" +#include "intrinsiccv/workspace/separable.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/neon_intrinsics.h b/intrinsiccv/include/intrinsiccv/neon_intrinsics.h similarity index 100% rename from intrinsiccv/include/neon_intrinsics.h rename to intrinsiccv/include/intrinsiccv/neon_intrinsics.h diff --git a/intrinsiccv/include/operations.h b/intrinsiccv/include/intrinsiccv/operations.h similarity index 99% rename from intrinsiccv/include/operations.h rename to intrinsiccv/include/intrinsiccv/operations.h index b806ddf47..7dc888a47 100644 --- a/intrinsiccv/include/operations.h +++ b/intrinsiccv/include/intrinsiccv/operations.h @@ -8,8 +8,8 @@ #include #include -#include "traits.h" -#include "types.h" +#include "intrinsiccv/traits.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/resize/resize.h b/intrinsiccv/include/intrinsiccv/resize/resize.h similarity index 97% rename from intrinsiccv/include/resize/resize.h rename to intrinsiccv/include/intrinsiccv/resize/resize.h index b7c2d7236..74f1d71ba 100644 --- a/intrinsiccv/include/resize/resize.h +++ b/intrinsiccv/include/intrinsiccv/resize/resize.h @@ -5,7 +5,7 @@ #ifndef INTRINSICCV_RESIZE_RESIZE_H #define INTRINSICCV_RESIZE_RESIZE_H -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/sve2.h b/intrinsiccv/include/intrinsiccv/sve2.h similarity index 99% rename from intrinsiccv/include/sve2.h rename to intrinsiccv/include/intrinsiccv/sve2.h index 543ab681e..dd21a4e7a 100644 --- a/intrinsiccv/include/sve2.h +++ b/intrinsiccv/include/intrinsiccv/sve2.h @@ -9,9 +9,9 @@ #include -#include "operations.h" -#include "utils.h" -#include "workspace/separable.h" +#include "intrinsiccv/operations.h" +#include "intrinsiccv/utils.h" +#include "intrinsiccv/workspace/separable.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/include/traits.h b/intrinsiccv/include/intrinsiccv/traits.h similarity index 99% rename from intrinsiccv/include/traits.h rename to intrinsiccv/include/intrinsiccv/traits.h index d29dd5b2b..c5d92a77e 100644 --- a/intrinsiccv/include/traits.h +++ b/intrinsiccv/include/intrinsiccv/traits.h @@ -7,7 +7,7 @@ #include -#include "config.h" +#include "intrinsiccv/config.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/types.h b/intrinsiccv/include/intrinsiccv/types.h similarity index 99% rename from intrinsiccv/include/types.h rename to intrinsiccv/include/intrinsiccv/types.h index f3da18420..b341980a6 100644 --- a/intrinsiccv/include/types.h +++ b/intrinsiccv/include/intrinsiccv/types.h @@ -9,9 +9,9 @@ #include #include -#include "config.h" -#include "ctypes.h" -#include "utils.h" +#include "intrinsiccv/config.h" +#include "intrinsiccv/ctypes.h" +#include "intrinsiccv/utils.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/unsafe.h b/intrinsiccv/include/intrinsiccv/unsafe.h similarity index 100% rename from intrinsiccv/include/unsafe.h rename to intrinsiccv/include/intrinsiccv/unsafe.h diff --git a/intrinsiccv/include/utils.h b/intrinsiccv/include/intrinsiccv/utils.h similarity index 99% rename from intrinsiccv/include/utils.h rename to intrinsiccv/include/intrinsiccv/utils.h index cf39b1581..4aec291eb 100644 --- a/intrinsiccv/include/utils.h +++ b/intrinsiccv/include/intrinsiccv/utils.h @@ -10,8 +10,8 @@ #include #include -#include "config.h" -#include "ctypes.h" +#include "intrinsiccv/config.h" +#include "intrinsiccv/ctypes.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/workspace/borders.h b/intrinsiccv/include/intrinsiccv/workspace/borders.h similarity index 99% rename from intrinsiccv/include/workspace/borders.h rename to intrinsiccv/include/intrinsiccv/workspace/borders.h index 76fe2e214..f849f6f35 100644 --- a/intrinsiccv/include/workspace/borders.h +++ b/intrinsiccv/include/intrinsiccv/workspace/borders.h @@ -5,7 +5,7 @@ #ifndef INTRINSICCV_WORKSPACE_BORDERS_H #define INTRINSICCV_WORKSPACE_BORDERS_H -#include "intrinsiccv.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/include/workspace/separable.h b/intrinsiccv/include/intrinsiccv/workspace/separable.h similarity index 99% rename from intrinsiccv/include/workspace/separable.h rename to intrinsiccv/include/intrinsiccv/workspace/separable.h index f2e2925c6..c0351368c 100644 --- a/intrinsiccv/include/workspace/separable.h +++ b/intrinsiccv/include/intrinsiccv/workspace/separable.h @@ -9,8 +9,8 @@ #include #include "borders.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/analysis/canny_neon.cpp b/intrinsiccv/src/analysis/canny_neon.cpp index c6a57bc64..b30eaeea7 100644 --- a/intrinsiccv/src/analysis/canny_neon.cpp +++ b/intrinsiccv/src/analysis/canny_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "containers/stack.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/containers/stack.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/analysis/count_nonzeros_neon.cpp b/intrinsiccv/src/analysis/count_nonzeros_neon.cpp index 66272e7dc..e54f789cc 100644 --- a/intrinsiccv/src/analysis/count_nonzeros_neon.cpp +++ b/intrinsiccv/src/analysis/count_nonzeros_neon.cpp @@ -5,8 +5,8 @@ #include #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv { namespace neon { diff --git a/intrinsiccv/src/analysis/min_max_api.cpp b/intrinsiccv/src/analysis/min_max_api.cpp index 57eb4f22a..1c79bcd17 100644 --- a/intrinsiccv/src/analysis/min_max_api.cpp +++ b/intrinsiccv/src/analysis/min_max_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/analysis/min_max_loc_neon.cpp b/intrinsiccv/src/analysis/min_max_loc_neon.cpp index 4dac4d23c..b88a5b714 100644 --- a/intrinsiccv/src/analysis/min_max_loc_neon.cpp +++ b/intrinsiccv/src/analysis/min_max_loc_neon.cpp @@ -5,8 +5,8 @@ #include #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" // This algorithm calculates the index of element in src array of the global // minimum and maximum values. diff --git a/intrinsiccv/src/analysis/min_max_neon.cpp b/intrinsiccv/src/analysis/min_max_neon.cpp index 6291bab4b..a935f5a9f 100644 --- a/intrinsiccv/src/analysis/min_max_neon.cpp +++ b/intrinsiccv/src/analysis/min_max_neon.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/absdiff_api.cpp b/intrinsiccv/src/arithmetics/absdiff_api.cpp index a4620e73f..7f1d40ef4 100644 --- a/intrinsiccv/src/arithmetics/absdiff_api.cpp +++ b/intrinsiccv/src/arithmetics/absdiff_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/absdiff_neon.cpp b/intrinsiccv/src/arithmetics/absdiff_neon.cpp index 43dc44b7f..5bcdabe52 100644 --- a/intrinsiccv/src/arithmetics/absdiff_neon.cpp +++ b/intrinsiccv/src/arithmetics/absdiff_neon.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/absdiff_sme2.cpp b/intrinsiccv/src/arithmetics/absdiff_sme2.cpp index 3002d7dc8..9cae9c717 100644 --- a/intrinsiccv/src/arithmetics/absdiff_sme2.cpp +++ b/intrinsiccv/src/arithmetics/absdiff_sme2.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sme2 { diff --git a/intrinsiccv/src/arithmetics/absdiff_sve2.cpp b/intrinsiccv/src/arithmetics/absdiff_sve2.cpp index 1b04676c3..576919233 100644 --- a/intrinsiccv/src/arithmetics/absdiff_sve2.cpp +++ b/intrinsiccv/src/arithmetics/absdiff_sve2.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/arithmetics/add_abs_with_threshold_api.cpp b/intrinsiccv/src/arithmetics/add_abs_with_threshold_api.cpp index 2d994c0fa..cb03e6e35 100644 --- a/intrinsiccv/src/arithmetics/add_abs_with_threshold_api.cpp +++ b/intrinsiccv/src/arithmetics/add_abs_with_threshold_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp b/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp index eb337442f..6f78b06f0 100644 --- a/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp +++ b/intrinsiccv/src/arithmetics/add_abs_with_threshold_neon.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/add_abs_with_threshold_sc.h b/intrinsiccv/src/arithmetics/add_abs_with_threshold_sc.h index cc03e0365..f2ef7cf14 100644 --- a/intrinsiccv/src/arithmetics/add_abs_with_threshold_sc.h +++ b/intrinsiccv/src/arithmetics/add_abs_with_threshold_sc.h @@ -7,8 +7,8 @@ #include -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/arithmetics/add_api.cpp b/intrinsiccv/src/arithmetics/add_api.cpp index 3c7fe424c..9461b4e87 100644 --- a/intrinsiccv/src/arithmetics/add_api.cpp +++ b/intrinsiccv/src/arithmetics/add_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/add_neon.cpp b/intrinsiccv/src/arithmetics/add_neon.cpp index 0b63b527d..d738e576a 100644 --- a/intrinsiccv/src/arithmetics/add_neon.cpp +++ b/intrinsiccv/src/arithmetics/add_neon.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/add_sme2.cpp b/intrinsiccv/src/arithmetics/add_sme2.cpp index aea4ae725..af9a3d36d 100644 --- a/intrinsiccv/src/arithmetics/add_sme2.cpp +++ b/intrinsiccv/src/arithmetics/add_sme2.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sme2 { diff --git a/intrinsiccv/src/arithmetics/add_sve2.cpp b/intrinsiccv/src/arithmetics/add_sve2.cpp index 12743b6b1..76b4073e3 100644 --- a/intrinsiccv/src/arithmetics/add_sve2.cpp +++ b/intrinsiccv/src/arithmetics/add_sve2.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/arithmetics/multiply_api.cpp b/intrinsiccv/src/arithmetics/multiply_api.cpp index 48bc895d7..7367ff599 100644 --- a/intrinsiccv/src/arithmetics/multiply_api.cpp +++ b/intrinsiccv/src/arithmetics/multiply_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/multiply_neon.cpp b/intrinsiccv/src/arithmetics/multiply_neon.cpp index ea3a0a202..5999c78c3 100644 --- a/intrinsiccv/src/arithmetics/multiply_neon.cpp +++ b/intrinsiccv/src/arithmetics/multiply_neon.cpp @@ -4,9 +4,9 @@ #include -#include "intrinsiccv.h" -#include "neon.h" -#include "types.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" +#include "intrinsiccv/types.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/multiply_sve2.cpp b/intrinsiccv/src/arithmetics/multiply_sve2.cpp index e2c9093e8..9a6c3f3a6 100644 --- a/intrinsiccv/src/arithmetics/multiply_sve2.cpp +++ b/intrinsiccv/src/arithmetics/multiply_sve2.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/arithmetics/scale_api.cpp b/intrinsiccv/src/arithmetics/scale_api.cpp index 7f94cd615..40479a543 100644 --- a/intrinsiccv/src/arithmetics/scale_api.cpp +++ b/intrinsiccv/src/arithmetics/scale_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/scale_neon.cpp b/intrinsiccv/src/arithmetics/scale_neon.cpp index 7193aa32c..7ad8538e2 100644 --- a/intrinsiccv/src/arithmetics/scale_neon.cpp +++ b/intrinsiccv/src/arithmetics/scale_neon.cpp @@ -6,8 +6,8 @@ #include #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/sub_api.cpp b/intrinsiccv/src/arithmetics/sub_api.cpp index 5336faf0d..30fc22ad7 100644 --- a/intrinsiccv/src/arithmetics/sub_api.cpp +++ b/intrinsiccv/src/arithmetics/sub_api.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/sub_neon.cpp b/intrinsiccv/src/arithmetics/sub_neon.cpp index 12bb85855..e673b8fd6 100644 --- a/intrinsiccv/src/arithmetics/sub_neon.cpp +++ b/intrinsiccv/src/arithmetics/sub_neon.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/sub_sme2.cpp b/intrinsiccv/src/arithmetics/sub_sme2.cpp index fa1348d38..549969a3c 100644 --- a/intrinsiccv/src/arithmetics/sub_sme2.cpp +++ b/intrinsiccv/src/arithmetics/sub_sme2.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sme2 { diff --git a/intrinsiccv/src/arithmetics/sub_sve2.cpp b/intrinsiccv/src/arithmetics/sub_sve2.cpp index 94a1ff889..7af4be3ce 100644 --- a/intrinsiccv/src/arithmetics/sub_sve2.cpp +++ b/intrinsiccv/src/arithmetics/sub_sve2.cpp @@ -4,8 +4,8 @@ #include -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/arithmetics/threshold_api.cpp b/intrinsiccv/src/arithmetics/threshold_api.cpp index 3510d048e..51d36abbd 100644 --- a/intrinsiccv/src/arithmetics/threshold_api.cpp +++ b/intrinsiccv/src/arithmetics/threshold_api.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/threshold_neon.cpp b/intrinsiccv/src/arithmetics/threshold_neon.cpp index c6bd35a13..4dea3c681 100644 --- a/intrinsiccv/src/arithmetics/threshold_neon.cpp +++ b/intrinsiccv/src/arithmetics/threshold_neon.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/arithmetics/threshold_sc.h b/intrinsiccv/src/arithmetics/threshold_sc.h index 93c38d29f..4a1a3862d 100644 --- a/intrinsiccv/src/arithmetics/threshold_sc.h +++ b/intrinsiccv/src/arithmetics/threshold_sc.h @@ -5,8 +5,8 @@ #ifndef INTRINSICCV_THRESHOLD_SC_H #define INTRINSICCV_THRESHOLD_SC_H -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/arithmetics/transpose_api.cpp b/intrinsiccv/src/arithmetics/transpose_api.cpp index 237d4340a..5611c31e9 100644 --- a/intrinsiccv/src/arithmetics/transpose_api.cpp +++ b/intrinsiccv/src/arithmetics/transpose_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "arithmetics/transpose.h" -#include "dispatch.h" -#include "intrinsiccv.h" +#include "intrinsiccv/arithmetics/transpose.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/arithmetics/transpose_neon.cpp b/intrinsiccv/src/arithmetics/transpose_neon.cpp index 642fa95ce..a793ad4b7 100644 --- a/intrinsiccv/src/arithmetics/transpose_neon.cpp +++ b/intrinsiccv/src/arithmetics/transpose_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "arithmetics/transpose.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/arithmetics/transpose.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/conversions/gray_to_rgb_api.cpp b/intrinsiccv/src/conversions/gray_to_rgb_api.cpp index 8cd845e95..2466a0b4a 100644 --- a/intrinsiccv/src/conversions/gray_to_rgb_api.cpp +++ b/intrinsiccv/src/conversions/gray_to_rgb_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/gray_to_rgb.h" -#include "dispatch.h" -#include "intrinsiccv.h" +#include "intrinsiccv/conversions/gray_to_rgb.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp b/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp index 477b7c265..7fc5833b9 100644 --- a/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp +++ b/intrinsiccv/src/conversions/gray_to_rgb_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/gray_to_rgb.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/conversions/gray_to_rgb.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/conversions/gray_to_rgb_sc.h b/intrinsiccv/src/conversions/gray_to_rgb_sc.h index 1f309fa60..b0d5fadb5 100644 --- a/intrinsiccv/src/conversions/gray_to_rgb_sc.h +++ b/intrinsiccv/src/conversions/gray_to_rgb_sc.h @@ -5,9 +5,9 @@ #ifndef INTRINSICCV_GRAY_TO_RGB_SC_H #define INTRINSICCV_GRAY_TO_RGB_SC_H -#include "conversions/gray_to_rgb.h" -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/conversions/gray_to_rgb.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/conversions/merge_api.cpp b/intrinsiccv/src/conversions/merge_api.cpp index 136432a65..5c66e7863 100644 --- a/intrinsiccv/src/conversions/merge_api.cpp +++ b/intrinsiccv/src/conversions/merge_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/merge.h" -#include "dispatch.h" -#include "intrinsiccv.h" +#include "intrinsiccv/conversions/merge.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/conversions/merge_neon.cpp b/intrinsiccv/src/conversions/merge_neon.cpp index 15018866f..3d15e9fc0 100644 --- a/intrinsiccv/src/conversions/merge_neon.cpp +++ b/intrinsiccv/src/conversions/merge_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/merge.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/conversions/merge.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_api.cpp b/intrinsiccv/src/conversions/rgb_to_rgb_api.cpp index fe0c8a3b2..ecf63bdec 100644 --- a/intrinsiccv/src/conversions/rgb_to_rgb_api.cpp +++ b/intrinsiccv/src/conversions/rgb_to_rgb_api.cpp @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/rgb_to_rgb.h" -#include "dispatch.h" -#include "intrinsiccv.h" -#include "types.h" +#include "intrinsiccv/conversions/rgb_to_rgb.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/types.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp b/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp index bb9e54de4..75b75f1c3 100644 --- a/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp +++ b/intrinsiccv/src/conversions/rgb_to_rgb_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/rgb_to_rgb.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/conversions/rgb_to_rgb.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/conversions/rgb_to_rgb_sc.h b/intrinsiccv/src/conversions/rgb_to_rgb_sc.h index d2b1ea030..ad06c5edb 100644 --- a/intrinsiccv/src/conversions/rgb_to_rgb_sc.h +++ b/intrinsiccv/src/conversions/rgb_to_rgb_sc.h @@ -5,9 +5,9 @@ #ifndef INTRINSICCV_RGB_TO_RGB_SC_H #define INTRINSICCV_RGB_TO_RGB_SC_H -#include "conversions/rgb_to_rgb.h" -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/conversions/rgb_to_rgb.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/conversions/split_api.cpp b/intrinsiccv/src/conversions/split_api.cpp index d647c961b..6673fba22 100644 --- a/intrinsiccv/src/conversions/split_api.cpp +++ b/intrinsiccv/src/conversions/split_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/split.h" -#include "dispatch.h" -#include "intrinsiccv.h" +#include "intrinsiccv/conversions/split.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/conversions/split_neon.cpp b/intrinsiccv/src/conversions/split_neon.cpp index 6f86f7c85..9fa8d4ab2 100644 --- a/intrinsiccv/src/conversions/split_neon.cpp +++ b/intrinsiccv/src/conversions/split_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/split.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/conversions/split.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/conversions/yuv_to_rgb_api.cpp b/intrinsiccv/src/conversions/yuv_to_rgb_api.cpp index 493d078a9..f315641eb 100644 --- a/intrinsiccv/src/conversions/yuv_to_rgb_api.cpp +++ b/intrinsiccv/src/conversions/yuv_to_rgb_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/yuv_to_rgb.h" -#include "dispatch.h" -#include "intrinsiccv.h" +#include "intrinsiccv/conversions/yuv_to_rgb.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp b/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp index 0c44da628..2ba481906 100644 --- a/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp +++ b/intrinsiccv/src/conversions/yuv_to_rgb_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "conversions/yuv_to_rgb.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/conversions/yuv_to_rgb.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/conversions/yuv_to_rgb_sc.h b/intrinsiccv/src/conversions/yuv_to_rgb_sc.h index e6f789ce5..a7c7b4133 100644 --- a/intrinsiccv/src/conversions/yuv_to_rgb_sc.h +++ b/intrinsiccv/src/conversions/yuv_to_rgb_sc.h @@ -7,9 +7,9 @@ #include -#include "conversions/yuv_to_rgb.h" -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/conversions/yuv_to_rgb.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/filters/gaussian_blur_api.cpp b/intrinsiccv/src/filters/gaussian_blur_api.cpp index 55fe9879b..0db22f4e2 100644 --- a/intrinsiccv/src/filters/gaussian_blur_api.cpp +++ b/intrinsiccv/src/filters/gaussian_blur_api.cpp @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "filters/gaussian_blur.h" -#include "intrinsiccv.h" -#include "workspace/separable.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/filters/gaussian_blur.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/workspace/separable.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/filters/gaussian_blur_neon.cpp b/intrinsiccv/src/filters/gaussian_blur_neon.cpp index 8cd1833cf..41183f1a4 100644 --- a/intrinsiccv/src/filters/gaussian_blur_neon.cpp +++ b/intrinsiccv/src/filters/gaussian_blur_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "filters/gaussian_blur.h" -#include "intrinsiccv.h" -#include "neon.h" +#include "intrinsiccv/filters/gaussian_blur.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/filters/gaussian_blur_sc.h b/intrinsiccv/src/filters/gaussian_blur_sc.h index 51ef9b141..1c07636c1 100644 --- a/intrinsiccv/src/filters/gaussian_blur_sc.h +++ b/intrinsiccv/src/filters/gaussian_blur_sc.h @@ -7,8 +7,8 @@ #include -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/filters/gaussian_blur_sme2.cpp b/intrinsiccv/src/filters/gaussian_blur_sme2.cpp index ea6ec7e1d..eb947a852 100644 --- a/intrinsiccv/src/filters/gaussian_blur_sme2.cpp +++ b/intrinsiccv/src/filters/gaussian_blur_sme2.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "filters/gaussian_blur.h" #include "gaussian_blur_sc.h" +#include "intrinsiccv/filters/gaussian_blur.h" namespace intrinsiccv::sme2 { diff --git a/intrinsiccv/src/filters/gaussian_blur_sve2.cpp b/intrinsiccv/src/filters/gaussian_blur_sve2.cpp index 45cae08dd..b3035b0a8 100644 --- a/intrinsiccv/src/filters/gaussian_blur_sve2.cpp +++ b/intrinsiccv/src/filters/gaussian_blur_sve2.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "filters/gaussian_blur.h" #include "gaussian_blur_sc.h" +#include "intrinsiccv/filters/gaussian_blur.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/filters/sobel_api.cpp b/intrinsiccv/src/filters/sobel_api.cpp index 4411e74a3..6a74ee2cd 100644 --- a/intrinsiccv/src/filters/sobel_api.cpp +++ b/intrinsiccv/src/filters/sobel_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "filters/sobel.h" -#include "intrinsiccv.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/filters/sobel.h" +#include "intrinsiccv/intrinsiccv.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/filters/sobel_neon.cpp b/intrinsiccv/src/filters/sobel_neon.cpp index 9cf62eea8..3426f7570 100644 --- a/intrinsiccv/src/filters/sobel_neon.cpp +++ b/intrinsiccv/src/filters/sobel_neon.cpp @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "filters/sobel.h" -#include "intrinsiccv.h" -#include "morphology/workspace.h" -#include "neon.h" +#include "intrinsiccv/filters/sobel.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/morphology/workspace.h" +#include "intrinsiccv/neon.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/filters/sobel_sc.h b/intrinsiccv/src/filters/sobel_sc.h index 47a90aed2..6fad83d5e 100644 --- a/intrinsiccv/src/filters/sobel_sc.h +++ b/intrinsiccv/src/filters/sobel_sc.h @@ -5,9 +5,9 @@ #ifndef INTRINSICCV_SOBEL_SC_H #define INTRINSICCV_SOBEL_SC_H -#include "filters/sobel.h" -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/filters/sobel.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/morphology/morphology_api.cpp b/intrinsiccv/src/morphology/morphology_api.cpp index 93c25cb2d..fd2084c14 100644 --- a/intrinsiccv/src/morphology/morphology_api.cpp +++ b/intrinsiccv/src/morphology/morphology_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "morphology/workspace.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/morphology/workspace.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/morphology/morphology_neon.cpp b/intrinsiccv/src/morphology/morphology_neon.cpp index 3f5b55769..bccce645b 100644 --- a/intrinsiccv/src/morphology/morphology_neon.cpp +++ b/intrinsiccv/src/morphology/morphology_neon.cpp @@ -5,10 +5,10 @@ #include #include -#include "intrinsiccv.h" -#include "morphology/workspace.h" -#include "neon.h" -#include "types.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/morphology/workspace.h" +#include "intrinsiccv/neon.h" +#include "intrinsiccv/types.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/morphology/morphology_sc.h b/intrinsiccv/src/morphology/morphology_sc.h index 7271504fd..39dd7d0a5 100644 --- a/intrinsiccv/src/morphology/morphology_sc.h +++ b/intrinsiccv/src/morphology/morphology_sc.h @@ -8,10 +8,10 @@ #include #include -#include "intrinsiccv.h" -#include "morphology/workspace.h" -#include "sve2.h" -#include "types.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/morphology/workspace.h" +#include "intrinsiccv/sve2.h" +#include "intrinsiccv/types.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/resize/resize_api.cpp b/intrinsiccv/src/resize/resize_api.cpp index 5fed82084..3ffad7a5c 100644 --- a/intrinsiccv/src/resize/resize_api.cpp +++ b/intrinsiccv/src/resize/resize_api.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "dispatch.h" -#include "intrinsiccv.h" -#include "resize/resize.h" +#include "intrinsiccv/dispatch.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/resize/resize.h" namespace intrinsiccv { diff --git a/intrinsiccv/src/resize/resize_neon.cpp b/intrinsiccv/src/resize/resize_neon.cpp index 38f54c260..da3c7787a 100644 --- a/intrinsiccv/src/resize/resize_neon.cpp +++ b/intrinsiccv/src/resize/resize_neon.cpp @@ -2,9 +2,9 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "intrinsiccv.h" -#include "neon.h" -#include "resize/resize.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/neon.h" +#include "intrinsiccv/resize/resize.h" namespace intrinsiccv::neon { diff --git a/intrinsiccv/src/resize/resize_sc.h b/intrinsiccv/src/resize/resize_sc.h index 78ca4529a..b46cc5600 100644 --- a/intrinsiccv/src/resize/resize_sc.h +++ b/intrinsiccv/src/resize/resize_sc.h @@ -5,8 +5,8 @@ #ifndef INTRINSICCV_RESIZE_SC_H #define INTRINSICCV_RESIZE_SC_H -#include "intrinsiccv.h" -#include "sve2.h" +#include "intrinsiccv/intrinsiccv.h" +#include "intrinsiccv/sve2.h" namespace intrinsiccv::sve2 { diff --git a/intrinsiccv/src/resize/resize_sme2.cpp b/intrinsiccv/src/resize/resize_sme2.cpp index dd8fd4d9d..69ae91e61 100644 --- a/intrinsiccv/src/resize/resize_sme2.cpp +++ b/intrinsiccv/src/resize/resize_sme2.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "resize/resize.h" +#include "intrinsiccv/resize/resize.h" #include "resize_sc.h" namespace intrinsiccv::sme2 { diff --git a/intrinsiccv/src/resize/resize_sve2.cpp b/intrinsiccv/src/resize/resize_sve2.cpp index e29c84e80..93e95f3e6 100644 --- a/intrinsiccv/src/resize/resize_sve2.cpp +++ b/intrinsiccv/src/resize/resize_sve2.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "resize/resize.h" +#include "intrinsiccv/resize/resize.h" #include "resize_sc.h" namespace intrinsiccv::sve2 { diff --git a/test/api/test_canny.cpp b/test/api/test_canny.cpp index 4415bea41..65c3c90c6 100644 --- a/test/api/test_canny.cpp +++ b/test/api/test_canny.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_CANNY(type, suffix) \ INTRINSICCV_API(canny, intrinsiccv_canny_##suffix, type) diff --git a/test/api/test_count_nonzeros.cpp b/test/api/test_count_nonzeros.cpp index 6365d79d3..35d15a0f5 100644 --- a/test/api/test_count_nonzeros.cpp +++ b/test/api/test_count_nonzeros.cpp @@ -3,12 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/array.h" #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_COUNT_NONZEROS(type, suffix) \ INTRINSICCV_API(count_nonzeros, intrinsiccv_count_nonzeros_##suffix, type) diff --git a/test/api/test_gaussian_blur.cpp b/test/api/test_gaussian_blur.cpp index 581980d66..591bae4ac 100644 --- a/test/api/test_gaussian_blur.cpp +++ b/test/api/test_gaussian_blur.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_GAUSSIAN_BLUR(type, kernel_suffix, type_suffix) \ INTRINSICCV_API(gaussian_blur_##kernel_suffix, \ diff --git a/test/api/test_merge.cpp b/test/api/test_merge.cpp index b263f15a7..0ea2aa7a6 100644 --- a/test/api/test_merge.cpp +++ b/test/api/test_merge.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/array.h" #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" template class MergeTest final { diff --git a/test/api/test_min_max.cpp b/test/api/test_min_max.cpp index 420c5d89a..816feb7f6 100644 --- a/test/api/test_min_max.cpp +++ b/test/api/test_min_max.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/array.h" #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_MIN_MAX(type, suffix) \ INTRINSICCV_API(min_max, intrinsiccv_min_max_##suffix, type) diff --git a/test/api/test_morphology.cpp b/test/api/test_morphology.cpp index 239a7f559..b8ff5116e 100644 --- a/test/api/test_morphology.cpp +++ b/test/api/test_morphology.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/operation.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_DILATE(type, suffix) \ INTRINSICCV_API(dilate, intrinsiccv_dilate_##suffix, type) diff --git a/test/api/test_resize_to_quarter.cpp b/test/api/test_resize_to_quarter.cpp index 128bf8d34..64207b83d 100644 --- a/test/api/test_resize_to_quarter.cpp +++ b/test/api/test_resize_to_quarter.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/array.h" #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" class ResizeToQuarterTest final { public: diff --git a/test/api/test_rgb_and_gray.cpp b/test/api/test_rgb_and_gray.cpp index 38426a2ef..3dc8550ef 100644 --- a/test/api/test_rgb_and_gray.cpp +++ b/test/api/test_rgb_and_gray.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/array.h" #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" class GrayTest final { public: diff --git a/test/api/test_saturating_absdiff.cpp b/test/api/test_saturating_absdiff.cpp index ead2aed1b..f4c58c263 100644 --- a/test/api/test_saturating_absdiff.cpp +++ b/test/api/test_saturating_absdiff.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/operation.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_SATURATING_ABSDIFF(type, suffix) \ INTRINSICCV_API(saturating_absdiff, intrinsiccv_saturating_absdiff_##suffix, \ diff --git a/test/api/test_saturating_add.cpp b/test/api/test_saturating_add.cpp index e52ca4fbe..f5a1844b3 100644 --- a/test/api/test_saturating_add.cpp +++ b/test/api/test_saturating_add.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/operation.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_SATURATING_ADD(type, suffix) \ INTRINSICCV_API(saturating_add, intrinsiccv_saturating_add_##suffix, type) diff --git a/test/api/test_saturating_multiply.cpp b/test/api/test_saturating_multiply.cpp index d17c6d06e..0c1007acc 100644 --- a/test/api/test_saturating_multiply.cpp +++ b/test/api/test_saturating_multiply.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/operation.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_SATURATING_MULTIPLY(type, suffix) \ INTRINSICCV_API(saturating_multiply, \ diff --git a/test/api/test_saturating_sub.cpp b/test/api/test_saturating_sub.cpp index f85a2f59b..16c52f475 100644 --- a/test/api/test_saturating_sub.cpp +++ b/test/api/test_saturating_sub.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/operation.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_SATURATING_SUB(type, suffix) \ INTRINSICCV_API(saturating_sub, intrinsiccv_saturating_sub_##suffix, type) diff --git a/test/api/test_scale.cpp b/test/api/test_scale.cpp index dda7d8436..989fbd942 100644 --- a/test/api/test_scale.cpp +++ b/test/api/test_scale.cpp @@ -3,11 +3,11 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/operation.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_SCALE(type, suffix) \ INTRINSICCV_API(scale, intrinsiccv_scale_##suffix, type) diff --git a/test/api/test_sobel.cpp b/test/api/test_sobel.cpp index 03ed3cdbc..7245a902e 100644 --- a/test/api/test_sobel.cpp +++ b/test/api/test_sobel.cpp @@ -3,13 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/array.h" #include "framework/generator.h" #include "framework/kernel.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_SOBEL_3X3_HORIZONTAL(type, suffix) \ INTRINSICCV_API(sobel_3x3_horizontal, \ diff --git a/test/api/test_split.cpp b/test/api/test_split.cpp index 42680237f..4be8db95f 100644 --- a/test/api/test_split.cpp +++ b/test/api/test_split.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/array.h" #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" template class SplitTest final { diff --git a/test/api/test_threshold_binary.cpp b/test/api/test_threshold_binary.cpp index 996fb846f..a4cd9cfea 100644 --- a/test/api/test_threshold_binary.cpp +++ b/test/api/test_threshold_binary.cpp @@ -3,9 +3,9 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/operation.h" +#include "intrinsiccv/intrinsiccv.h" #define INTRINSICCV_THRESHOLD_BINARY(type, suffix) \ INTRINSICCV_API(threshold_binary, intrinsiccv_threshold_binary_##suffix, type) diff --git a/test/api/test_transpose.cpp b/test/api/test_transpose.cpp index 1da3d7155..7a7725bd5 100644 --- a/test/api/test_transpose.cpp +++ b/test/api/test_transpose.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/array.h" #include "framework/generator.h" +#include "intrinsiccv/intrinsiccv.h" template class TestTranspose final { diff --git a/test/api/test_yuv_to_rgb.cpp b/test/api/test_yuv_to_rgb.cpp index 7f4dc641c..387b1d828 100644 --- a/test/api/test_yuv_to_rgb.cpp +++ b/test/api/test_yuv_to_rgb.cpp @@ -3,10 +3,10 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include "framework/array.h" #include "framework/utils.h" +#include "intrinsiccv/intrinsiccv.h" class YuvTest final { public: diff --git a/test/framework/border.h b/test/framework/border.h index 803d5546e..cef6c2f4a 100644 --- a/test/framework/border.h +++ b/test/framework/border.h @@ -5,9 +5,8 @@ #ifndef INTRINSICCV_TEST_FRAMEWORK_BORDER_H_ #define INTRINSICCV_TEST_FRAMEWORK_BORDER_H_ -#include - #include "framework/abstract.h" +#include "intrinsiccv/intrinsiccv.h" namespace test { diff --git a/test/framework/kernel.h b/test/framework/kernel.h index 8d7979efa..c503951b4 100644 --- a/test/framework/kernel.h +++ b/test/framework/kernel.h @@ -6,7 +6,6 @@ #define INTRINSICCV_TEST_FRAMEWORK_KERNEL_H_ #include -#include #include #include @@ -16,6 +15,7 @@ #include "framework/border.h" #include "framework/generator.h" #include "framework/types.h" +#include "intrinsiccv/intrinsiccv.h" namespace test { diff --git a/test/framework/test_kernel.cpp b/test/framework/test_kernel.cpp index f9af117c3..e23b70f96 100644 --- a/test/framework/test_kernel.cpp +++ b/test/framework/test_kernel.cpp @@ -3,12 +3,12 @@ // SPDX-License-Identifier: Apache-2.0 #include -#include #include #include "framework/kernel.h" #include "framework/types.h" +#include "intrinsiccv/intrinsiccv.h" // Tests that the constructor of test::Kernel works for odd width and // height. diff --git a/test/framework/utils.h b/test/framework/utils.h index e266a3a8f..ccdcaad97 100644 --- a/test/framework/utils.h +++ b/test/framework/utils.h @@ -13,9 +13,9 @@ #include #include -#include "ctypes.h" #include "framework/abstract.h" #include "framework/types.h" +#include "intrinsiccv/ctypes.h" #define INTRINSICCV_API(name, impl, type) \ template