Skip to content

Commit 33be79a

Browse files
authored
Spelling consistency: grey -> gray (#9964)
1 parent 9da2aab commit 33be79a

File tree

7 files changed

+49
-10
lines changed

7 files changed

+49
-10
lines changed

.typos.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ extend-exclude = [
99
"crates/viewer/re_ui/data/design_tokens.json",
1010
"crates/viewer/re_ui/src/design_tokens.rs",
1111
"examples/assets",
12+
"rerun_cpp/src/rerun/archetypes/image.hpp", # TODO(emilk): remove once we remove from_greyscale8
13+
"rerun_cpp/src/rerun/archetypes/image_ext.cpp", # TODO(emilk): remove once we remove from_greyscale8
1214
"rerun_cpp/src/rerun/third_party/cxxopts.hpp",
1315
]
1416

@@ -74,6 +76,8 @@ flavour = "flavor"
7476
fulfil = "fufill"
7577
gaol = "jail"
7678
grey = "gray"
79+
greys = "grays"
80+
greyscale = "grayscale"
7781
harbour = "habor"
7882
honour = "honor"
7983
humour = "humor"

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ _All four tetrahedron meshes on this screen share the same vertices and are inst
12591259
- Add an explicit "mode" view property to the dataframe view [#6927](https://github.com/rerun-io/rerun/pull/6927)
12601260
- Introduce a "Selectable Toggle" widget and use it for the 3D view's camera kind [#7064](https://github.com/rerun-io/rerun/pull/7064)
12611261
- Improve entity stats when hovered [#7074](https://github.com/rerun-io/rerun/pull/7074)
1262-
- Update the UI colors to use our (blueish) ramp instead of pure greys [#7075](https://github.com/rerun-io/rerun/pull/7075)
1262+
- Update the UI colors to use our (blueish) ramp instead of pure grays [#7075](https://github.com/rerun-io/rerun/pull/7075)
12631263
- Query editor for the dataframe view [#7071](https://github.com/rerun-io/rerun/pull/7071)
12641264
- Better ui for `Blob`s, especially those representing images [#7128](https://github.com/rerun-io/rerun/pull/7128)
12651265
- Add button for copying and saving images [#7156](https://github.com/rerun-io/rerun/pull/7156)

crates/utils/re_video/src/decode/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//! * is either 8 or 16
1515
//! * that's how the decoder stores for us but the per component we have either 8 or 10 or 12 bits -> see `picture.bits_per_component()`
1616
//! * `picture.pixel_layout()`
17-
//! * `4:0:0` greyscale
17+
//! * `4:0:0` grayscale
1818
//! * `4:2:0` half horizontal and half vertical resolution for chroma
1919
//! * `4:2:2` half horizontal resolution for chroma
2020
//! * `4:4:4` full resolution for chroma

rerun_cpp/src/rerun/archetypes/image.hpp

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rerun_cpp/src/rerun/archetypes/image_ext.cpp

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,34 @@ namespace rerun::archetypes {
9898
resolution, color_model, get_datatype(elements)
9999
) {}
100100

101-
/// Assumes single channel greyscale/luminance with 8-bit per value.
101+
/// Assumes single channel grayscale/luminance with 8-bit per value.
102102
///
103103
/// @param bytes Pixel data as a `rerun::Collection`.
104104
/// If the data does not outlive the image, use `std::move` or create the `rerun::Collection`
105105
/// explicitly ahead of time with `rerun::Collection::take_ownership`.
106106
/// The length of the data should be `W * H`.
107107
/// @param resolution The resolution of the image as {width, height}.
108-
static Image from_greyscale8(Collection<uint8_t> bytes, WidthHeight resolution) {
108+
static Image from_grayscale8(Collection<uint8_t> bytes, WidthHeight resolution) {
109109
return Image(bytes, resolution, datatypes::ColorModel::L, datatypes::ChannelDatatype::U8);
110110
}
111111

112+
/// Assumes single channel grayscale/luminance with 8-bit per value.
113+
///
114+
/// @param bytes Pixel data as a `rerun::Collection`.
115+
/// If the data does not outlive the image, use `std::move` or create the `rerun::Collection`
116+
/// explicitly ahead of time with `rerun::Collection::take_ownership`.
117+
/// The length of the data should be `W * H`.
118+
/// @param resolution The resolution of the image as {width, height}.
119+
[[deprecated("Renamed `from_grayscale8`")]]
120+
static Image from_greyscale8(Collection<uint8_t> bytes, WidthHeight resolution) {
121+
return Image(
122+
bytes,
123+
resolution,
124+
datatypes::ColorModel::L,
125+
datatypes::ChannelDatatype::U8
126+
);
127+
}
128+
112129
/// Assumes RGB, 8-bit per channel, packed as `RGBRGBRGB…`.
113130
///
114131
/// @param bytes Pixel data as a `rerun::Collection`.

rerun_cpp/tests/archetypes/image.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using namespace rerun::datatypes;
88
#define TEST_TAG "[image][archetypes]"
99

1010
SCENARIO("Image archetype can be created" TEST_TAG) {
11-
GIVEN("simple 8bit greyscale image") {
11+
GIVEN("simple 8bit grayscale image") {
1212
std::vector<uint8_t> data(10 * 10, 0);
1313
Image reference_image;
1414
reference_image.buffer = rerun::ComponentBatch::from_loggable(
@@ -39,9 +39,9 @@ SCENARIO("Image archetype can be created" TEST_TAG) {
3939
test_compare_archetype_serialization(image_from_collection, reference_image);
4040
}
4141
}
42-
THEN("no error occurs on image construction from the greyscale utility") {
42+
THEN("no error occurs on image construction from the grayscale utility") {
4343
auto image_from_util = check_logged_error([&] {
44-
return Image::from_greyscale8(data, {10, 10});
44+
return Image::from_grayscale8(data, {10, 10});
4545
});
4646
AND_THEN("serialization succeeds") {
4747
test_compare_archetype_serialization(image_from_util, reference_image);

tests/python/release_checklist/check_chroma_subsampling.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
All images should look roughly the same except for some chroma artifacts
2121
and slight color differences due to different yuv conversion matrix coefficients.
2222
23-
Naturally, Y8 formats are greyscale.
23+
Naturally, Y8 formats are grayscale.
2424
"""
2525

2626

0 commit comments

Comments
 (0)