From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:27 +0200
Subject: Adding upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc')

diff --git a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc
index a5b1af63b2..7d76ba9002 100644
--- a/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc
+++ b/third_party/jpeg-xl/lib/jxl/enc_dot_dictionary.cc
@@ -9,17 +9,12 @@
 #include <string.h>
 
 #include <array>
-#include <utility>
 
 #include "lib/jxl/base/override.h"
 #include "lib/jxl/base/status.h"
 #include "lib/jxl/chroma_from_luma.h"
-#include "lib/jxl/dec_bit_reader.h"
-#include "lib/jxl/dec_xyb.h"
-#include "lib/jxl/enc_bit_writer.h"
 #include "lib/jxl/enc_detect_dots.h"
 #include "lib/jxl/enc_params.h"
-#include "lib/jxl/enc_xyb.h"
 #include "lib/jxl/image.h"
 
 namespace jxl {
@@ -39,10 +34,9 @@ const std::array<double, 3> kEllipseMaxIntensity{{0.05, 1.0, 0.4}};
 const std::array<size_t, 3> kEllipseIntensityQ{{10, 36, 10}};
 }  // namespace
 
-std::vector<PatchInfo> FindDotDictionary(const CompressParams& cparams,
-                                         const Image3F& opsin,
-                                         const ColorCorrelationMap& cmap,
-                                         ThreadPool* pool) {
+StatusOr<std::vector<PatchInfo>> FindDotDictionary(
+    const CompressParams& cparams, const Image3F& opsin, const Rect& rect,
+    const ColorCorrelationMap& cmap, ThreadPool* pool) {
   if (ApplyOverride(cparams.dots,
                     cparams.butteraugli_distance >= kMinButteraugliForDots)) {
     GaussianDetectParams ellipse_params;
@@ -58,14 +52,15 @@ std::vector<PatchInfo> FindDotDictionary(const CompressParams& cparams,
     ellipse_params.maxCC = 100;
     ellipse_params.percCC = 100;
     EllipseQuantParams qParams{
-        opsin.xsize(),      opsin.ysize(),        kEllipsePosQ,
+        rect.xsize(),       rect.ysize(),         kEllipsePosQ,
         kEllipseMinSigma,   kEllipseMaxSigma,     kEllipseSigmaQ,
         kEllipseAngleQ,     kEllipseMinIntensity, kEllipseMaxIntensity,
         kEllipseIntensityQ, kEllipsePosQ <= 5,    cmap.YtoXRatio(0),
         cmap.YtoBRatio(0)};
 
-    return DetectGaussianEllipses(opsin, ellipse_params, qParams, pool);
+    return DetectGaussianEllipses(opsin, rect, ellipse_params, qParams, pool);
   }
-  return {};
+  std::vector<PatchInfo> nothing;
+  return nothing;
 }
 }  // namespace jxl
-- 
cgit v1.2.3