1 files changed, 15 insertions, 15 deletions
diff --git a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc b/third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc
index dda2bbb0aa..76165d26e7 100644
--- a/third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc
+++ b/third_party/jpeg-xl/lib/jxl/cms/tone_mapping_test.cc
@@ -30,17 +30,17 @@ HWY_NOINLINE void TestRec2408ToneMap() {
   for (size_t i = 0; i < kNumTrials; i++) {
     float src = 11000.0 + rng.UniformF(-150.0f, 150.0f);
     float tgt = 250 + rng.UniformF(-5.0f, 5.0f);
-    float luminances[3] = {rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
-                           rng.UniformF(0.2f, 0.4f)};
-    float rgb[3] = {rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
-                    rng.UniformF(0.0f, 1.0f)};
+    Vector3 luminances{rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
+                       rng.UniformF(0.2f, 0.4f)};
+    Color rgb{rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
+              rng.UniformF(0.0f, 1.0f)};
     Rec2408ToneMapper<decltype(d)> tone_mapper({0, src}, {0, tgt}, luminances);
     auto r = Set(d, rgb[0]);
     auto g = Set(d, rgb[1]);
     auto b = Set(d, rgb[2]);
     tone_mapper.ToneMap(&r, &g, &b);
     Rec2408ToneMapperBase tone_mapper_base({0, src}, {0, tgt}, luminances);
-    tone_mapper_base.ToneMap(&rgb[0], &rgb[1], &rgb[2]);
+    tone_mapper_base.ToneMap(rgb);
     const float actual_r = GetLane(r);
     const float expected_r = rgb[0];
     const float abs_err_r = std::abs(expected_r - actual_r);
@@ -66,17 +66,17 @@ HWY_NOINLINE void TestHlgOotfApply() {
   for (size_t i = 0; i < kNumTrials; i++) {
     float src = 300.0 + rng.UniformF(-50.0f, 50.0f);
     float tgt = 80 + rng.UniformF(-5.0f, 5.0f);
-    float luminances[3] = {rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
-                           rng.UniformF(0.2f, 0.4f)};
-    float rgb[3] = {rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
-                    rng.UniformF(0.0f, 1.0f)};
+    Vector3 luminances{rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
+                       rng.UniformF(0.2f, 0.4f)};
+    Color rgb{rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
+              rng.UniformF(0.0f, 1.0f)};
     HlgOOTF ootf(src, tgt, luminances);
     auto r = Set(d, rgb[0]);
     auto g = Set(d, rgb[1]);
     auto b = Set(d, rgb[2]);
     ootf.Apply(&r, &g, &b);
     HlgOOTF_Base ootf_base(src, tgt, luminances);
-    ootf_base.Apply(&rgb[0], &rgb[1], &rgb[2]);
+    ootf_base.Apply(rgb);
     const float actual_r = GetLane(r);
     const float expected_r = rgb[0];
     const float abs_err_r = std::abs(expected_r - actual_r);
@@ -101,15 +101,15 @@ HWY_NOINLINE void TestGamutMap() {
   HWY_FULL(float) d;
   for (size_t i = 0; i < kNumTrials; i++) {
     float preserve_saturation = rng.UniformF(0.2f, 0.4f);
-    float luminances[3] = {rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
-                           rng.UniformF(0.2f, 0.4f)};
-    float rgb[3] = {rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
-                    rng.UniformF(0.0f, 1.0f)};
+    Vector3 luminances{rng.UniformF(0.2f, 0.4f), rng.UniformF(0.2f, 0.4f),
+                       rng.UniformF(0.2f, 0.4f)};
+    Color rgb{rng.UniformF(0.0f, 1.0f), rng.UniformF(0.0f, 1.0f),
+              rng.UniformF(0.0f, 1.0f)};
     auto r = Set(d, rgb[0]);
     auto g = Set(d, rgb[1]);
     auto b = Set(d, rgb[2]);
     GamutMap(&r, &g, &b, luminances, preserve_saturation);
-    GamutMapScalar(&rgb[0], &rgb[1], &rgb[2], luminances, preserve_saturation);
+    GamutMapScalar(rgb, luminances, preserve_saturation);
     const float actual_r = GetLane(r);
     const float expected_r = rgb[0];
     const float abs_err_r = std::abs(expected_r - actual_r);