Fix build for platforms with scalable vectors (#4025)

(cherry picked from commit 24e12baf0e8e697fdde84a5250b2df32f18cf40b)
google · Dec 27, 2024 · ac19b28 · ac19b28
1 parent 66d9f98
commit ac19b28
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/lib/extras/jpegli_test.cc b/lib/extras/jpegli_test.cc
@@ -384,8 +384,10 @@ TEST_P(JpegliColorQuantTestParam, JpegliColorQuantizeTest) {
   dparams2.dither_mode = config.dither;
   ASSERT_TRUE(DecodeJpeg(compressed, dparams2, nullptr, &ppf2));
 
-  double dist1 = Butteraugli3Norm(memory_manager, ppf0, ppf1);
-  double dist2 = Butteraugli3Norm(memory_manager, ppf0, ppf2);
+  JXL_TEST_ASSIGN_OR_DIE(double dist1,
+                         Butteraugli3Norm(memory_manager, ppf0, ppf1));
+  JXL_TEST_ASSIGN_OR_DIE(double dist2,
+                         Butteraugli3Norm(memory_manager, ppf0, ppf2));
   printf("distance: %f  vs %f\n", dist2, dist1);
   if (config.passes == 1) {
     if (config.num_colors == 16 && config.dither == 2) {

diff --git a/lib/extras/metrics.cc b/lib/extras/metrics.cc
@@ -306,9 +306,10 @@ StatusOr<double> ComputeDistanceP(const ImageF& distmap,
   return HWY_DYNAMIC_DISPATCH(ComputeDistanceP)(distmap, params, p);
 }
 
-float Butteraugli3Norm(JxlMemoryManager* memory_manager,
-                       const extras::PackedPixelFile& a,
-                       const extras::PackedPixelFile& b, ThreadPool* pool) {
+StatusOr<double> Butteraugli3Norm(JxlMemoryManager* memory_manager,
+                                  const extras::PackedPixelFile& a,
+                                  const extras::PackedPixelFile& b,
+                                  ThreadPool* pool) {
   ButteraugliParams params;
   ImageF distmap;
   ButteraugliDistance(memory_manager, a, b, params, &distmap, pool);

diff --git a/lib/extras/metrics.h b/lib/extras/metrics.h
@@ -31,10 +31,10 @@ float ButteraugliDistance(JxlMemoryManager* memory_manager,
 StatusOr<double> ComputeDistanceP(const ImageF& distmap,
                                   const ButteraugliParams& params, double p);
 
-float Butteraugli3Norm(JxlMemoryManager* memory_manager,
-                       const extras::PackedPixelFile& a,
-                       const extras::PackedPixelFile& b,
-                       ThreadPool* pool = nullptr);
+StatusOr<double> Butteraugli3Norm(JxlMemoryManager* memory_manager,
+                                  const extras::PackedPixelFile& a,
+                                  const extras::PackedPixelFile& b,
+                                  ThreadPool* pool = nullptr);
 
 double ComputePSNR(JxlMemoryManager* memory_manager,
                    const extras::PackedPixelFile& a,