From fedd61137ba0d630402f7618b455170fc0e376c7 Mon Sep 17 00:00:00 2001 From: Michael Platings Date: Fri, 17 May 2024 12:20:49 +0000 Subject: [PATCH] Use consistent spelling of color --- doc/functionality.md | 2 +- kleidicv/include/kleidicv/kleidicv.h | 8 +++---- test/api/test_rgb_and_gray.cpp | 36 ++++++++++++++-------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/functionality.md b/doc/functionality.md index d0c060074..a9d7c45c0 100644 --- a/doc/functionality.md +++ b/doc/functionality.md @@ -19,7 +19,7 @@ See `doc/opencv.md` for details of the functionality available in OpenCV. | SaturatingAddAbsWithThreshold| | | x | | | | | | | Scale | | x | | | | | | | -## Colour conversions +## Color conversions | | u8 | |-----------|-----| | Gray-RGB | x | diff --git a/kleidicv/include/kleidicv/kleidicv.h b/kleidicv/include/kleidicv/kleidicv.h index 63a9b2771..cb0381c23 100644 --- a/kleidicv/include/kleidicv/kleidicv.h +++ b/kleidicv/include/kleidicv/kleidicv.h @@ -408,7 +408,7 @@ KLEIDICV_API_DECLARATION(kleidicv_rgba_to_rgba_u8, const uint8_t *src, /// Converts an RGB image to BGRA. All channels are 8-bit wide. /// -/// Corresponding colours are set while Alpha channel is set to 0xFF. +/// Corresponding colors are set while Alpha channel is set to 0xFF. /// Destination data is filled as follows: /// | B,G,R,A | B,G,R,A | B,G,R,A | ... /// Each letter represents one byte of data, and one pixel is represented @@ -434,7 +434,7 @@ KLEIDICV_API_DECLARATION(kleidicv_rgb_to_bgra_u8, const uint8_t *src, /// Converts an RGB image to RGBA. All channels are 8-bit wide. /// -/// Corresponding colours are set while Alpha channel is set to 0xFF. +/// Corresponding colors are set while Alpha channel is set to 0xFF. /// Destination data is filled as follows: /// | R,G,B,A | R,G,B,A | R,G,B,A | ... /// Each letter represents one byte of data, and one pixel is represented @@ -460,7 +460,7 @@ KLEIDICV_API_DECLARATION(kleidicv_rgb_to_rgba_u8, const uint8_t *src, /// Converts an RGBA image to BGR. All channels are 8-bit wide. /// -/// Corresponding colours are set while Alpha channel is discarded. +/// Corresponding colors are set while Alpha channel is discarded. /// Destination data is filled as follows: /// | B,G,R | B,G,R | B,G,R | ... /// Each letter represents one byte of data, and one pixel is represented @@ -486,7 +486,7 @@ KLEIDICV_API_DECLARATION(kleidicv_rgba_to_bgr_u8, const uint8_t *src, /// Converts an RGBA image to RGB. All channels are 8-bit wide. /// -/// Corresponding colours are set while Alpha channel is discarded. +/// Corresponding colors are set while Alpha channel is discarded. /// Destination data is filled as follows: /// | R,G,B | R,G,B | R,G,B | ... /// Each letter represents one byte of data, and one pixel is represented diff --git a/test/api/test_rgb_and_gray.cpp b/test/api/test_rgb_and_gray.cpp index 09ec2b500..cdffcea90 100644 --- a/test/api/test_rgb_and_gray.cpp +++ b/test/api/test_rgb_and_gray.cpp @@ -83,9 +83,9 @@ class GrayTest final { size_t outChannels_; }; -class ColourTest final { +class ColorTest final { public: - ColourTest(size_t src_channels, size_t dst_channels, bool swapBlue) + ColorTest(size_t src_channels, size_t dst_channels, bool swapBlue) : inChannels_(src_channels), outChannels_(dst_channels), swapBlue_(swapBlue) {} @@ -183,41 +183,41 @@ TEST(GRAY2, RGBA) { } TEST(RGB2, RGB) { - ColourTest colour_test(3, 3, false); - colour_test.execute_test(kleidicv_rgb_to_rgb_u8); + ColorTest color_test(3, 3, false); + color_test.execute_test(kleidicv_rgb_to_rgb_u8); } TEST(RGBA2, RGBA) { - ColourTest colour_test(4, 4, false); - colour_test.execute_test(kleidicv_rgba_to_rgba_u8); + ColorTest color_test(4, 4, false); + color_test.execute_test(kleidicv_rgba_to_rgba_u8); } TEST(RGB2, BGR) { - ColourTest colour_test(3, 3, true); - colour_test.execute_test(kleidicv_rgb_to_bgr_u8); + ColorTest color_test(3, 3, true); + color_test.execute_test(kleidicv_rgb_to_bgr_u8); } TEST(RGBA2, BGRA) { - ColourTest colour_test(4, 4, true); - colour_test.execute_test(kleidicv_rgba_to_bgra_u8); + ColorTest color_test(4, 4, true); + color_test.execute_test(kleidicv_rgba_to_bgra_u8); } TEST(RGB2, BGRA) { - ColourTest colour_test(3, 4, true); - colour_test.execute_test(kleidicv_rgb_to_bgra_u8); + ColorTest color_test(3, 4, true); + color_test.execute_test(kleidicv_rgb_to_bgra_u8); } TEST(RGB2, RGBA) { - ColourTest colour_test(3, 4, false); - colour_test.execute_test(kleidicv_rgb_to_rgba_u8); + ColorTest color_test(3, 4, false); + color_test.execute_test(kleidicv_rgb_to_rgba_u8); } TEST(RGBA2, BGR) { - ColourTest colour_test(4, 3, true); - colour_test.execute_test(kleidicv_rgba_to_bgr_u8); + ColorTest color_test(4, 3, true); + color_test.execute_test(kleidicv_rgba_to_bgr_u8); } TEST(RGBA2, RGB) { - ColourTest colour_test(4, 3, false); - colour_test.execute_test(kleidicv_rgba_to_rgb_u8); + ColorTest color_test(4, 3, false); + color_test.execute_test(kleidicv_rgba_to_rgb_u8); } -- GitLab