Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 16 deletions

diff --git a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h
index 641d7732d5..4f70e21a1b 100644
--- a/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h
+++ b/third_party/jpeg-xl/lib/jxl/enc_butteraugli_comparator.h
@@ -10,9 +10,7 @@
 #include <stddef.h>
 
 #include <memory>
-#include <vector>
 
-#include "lib/jxl/base/data_parallel.h"
 #include "lib/jxl/base/status.h"
 #include "lib/jxl/butteraugli/butteraugli.h"
 #include "lib/jxl/enc_comparator.h"
@@ -43,20 +41,6 @@ class JxlButteraugliComparator : public Comparator {
   size_t ysize_ = 0;
 };
 
-// Returns the butteraugli distance between rgb0 and rgb1.
-// If distmap is not null, it must be the same size as rgb0 and rgb1.
-float ButteraugliDistance(const ImageBundle& rgb0, const ImageBundle& rgb1,
-                          const ButteraugliParams& params,
-                          const JxlCmsInterface& cms, ImageF* distmap = nullptr,
-                          ThreadPool* pool = nullptr,
-                          bool ignore_alpha = false);
-
-float ButteraugliDistance(const std::vector<ImageBundle>& frames0,
-                          const std::vector<ImageBundle>& frames1,
-                          const ButteraugliParams& params,
-                          const JxlCmsInterface& cms, ImageF* distmap = nullptr,
-                          ThreadPool* pool = nullptr);
-
 }  // namespace jxl
 
 #endif  // LIB_JXL_ENC_BUTTERAUGLI_COMPARATOR_H_