From 0e567ad697d9a44885fb9f575b2b2fb491560a29 Mon Sep 17 00:00:00 2001
From: +merlan #flirora <flirora@flirora.xyz>
Date: Tue, 24 Jun 2025 17:16:50 -0400
Subject: [PATCH] Simplify gradient sampling logic

---
 .../typst-library/src/visualize/gradient.rs   |  34 ++++++------------
 ...2-coincident-gradient-stops-export-png.png | Bin 522 -> 520 bytes
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/crates/typst-library/src/visualize/gradient.rs b/crates/typst-library/src/visualize/gradient.rs
index e19b410bc..20539197c 100644
--- a/crates/typst-library/src/visualize/gradient.rs
+++ b/crates/typst-library/src/visualize/gradient.rs
@@ -1284,34 +1284,20 @@ fn process_stops(stops: &[Spanned<GradientStop>]) -> SourceResult<Vec<(Color, Ra
 
 /// Sample the stops at a given position.
 fn sample_stops(stops: &[(Color, Ratio)], mixing_space: ColorSpace, t: f64) -> Color {
+    assert!(!stops.is_empty(), "Cannot sample from gradient with no stops");
+
     let t = t.clamp(0.0, 1.0);
-    let mut low = 0;
-    let mut high = stops.len();
+    let j = stops.partition_point(|(_, ratio)| ratio.get() < t);
 
-    while low < high {
-        let mid = (low + high) / 2;
-        if stops[mid].1.get() < t {
-            low = mid + 1;
-        } else {
-            high = mid;
-        }
+    if j == 0 {
+        return stops[0].0;
+    }
+    if j == stops.len() {
+        return stops.last().unwrap().0;
     }
 
-    if low == 0 {
-        low = 1;
-    }
-    if t == 1.0 {
-        while stops[low - 1].1 >= stops[low].1 {
-            low -= 1;
-        }
-    } else {
-        while stops[low - 1].1 >= stops[low].1 {
-            low += 1;
-        }
-    }
-
-    let (col_0, pos_0) = stops[low - 1];
-    let (col_1, pos_1) = stops[low];
+    let (col_0, pos_0) = stops[j - 1];
+    let (col_1, pos_1) = stops[j];
     debug_assert!(pos_0 < pos_1);
     debug_assert!(pos_0.get() <= t);
     debug_assert!(t <= pos_1.get());
diff --git a/tests/ref/issue-6162-coincident-gradient-stops-export-png.png b/tests/ref/issue-6162-coincident-gradient-stops-export-png.png
index d269342c7c6678e525f62b7d85b080e2fcfd812d..886ea195d7803623f0422d1c66e6edd2a1797c34 100644
GIT binary patch
delta 494
zcmV<K0TKR+1c(HXB!5s)OjJex|Ns9%HvLC7`b{?YQ#bZlH}hRL@nJXaWjO3<IO%OT
z=5aXWbvfa9Io^CZ+kZLOf;rWNI?{+b&x<<DjylPaJH?bc!k0U~nLE3jJGY)Zv!Oh%
zq&%ypJg2BVqpLlhtv#8rJ(RLNkF-9Dw?2fqK7PACc)dPxzkfez!arfeKUc;-Ovpe#
z%0U14_W$th|LNub;@tn*)Bn@U|I5Pv#JT^xvH!HF|E!<?rI-Jmj{lT~|BQYAgmnLV
zYyWa$|7cnNUQqv3M*m1W0C(3Z$xbWEM<&NqBgR@G#9to5WE;U~7r$*3y>Sq{bql(A
z2Dp6zwt)b(gnt0DhybyR0I!Y!u95((l>n-k0H~V)rk((#p#Y<#0HLP<pQ!+ytN@#@
z0GYA?m$U$tw*Zs50Fb-@j=unm!2pWH0Eor_g~$Md%K(AR0DjN_e9{1U)NBdqKL7v#
zb4f%&RCwC$*r5@CKnz8}%h3;AP$2!#1w%bx5huXqCTIIp-0GhuNz)atbGv(d>^i_;
zFc=I5gTY`h7@QckcO|LTXYWrZ7z_r3!C){L3<iS}!}hKumHO<pHAXGb2kl@m7z_r3
k!C){L3{DK&yOQel0IBenTex6up8x;=07*qoM6N<$g8owRH~;_u

delta 496
zcmV<M0T2F&1d0TZB!5#-OjJex|Nj7a)Bt?a0DjN_fz1Ge%K(MQ0Eor_io^hn!2piG
z0Fb-@leqwuw*Z&40GYA?o38+!tN@>>0HLP<qoe?&p#Y|y0H~V)s+a(*l>n}i0I!Y!
zv5Nq+hyb;O0k(k#xP1${c@VsH6uog5zik`AXdc33A;e!J#(!ES$5biFPAkesF3dnb
z%0NuWKv%{;VZ=Xa!as4pKX|=9e!D(|xju@wK996Ml(IdUusxowJ)^5Vr>H%vraZ5t
zJhP!Zx1Kz^oIAdmJHnSc#gseAkvq(eI?szb(ug|Mg*w=RIop3Z-h4UXcsb;CIp%RV
z>1{adX*lj>IDheBH}hRL_E<OgQ#bleHvLC7|3NkYch~<&JpWWi|6Wl4Xj%VqV*h(<
z|Ach^jD7!<hX0+8|D~7zte^k1sQ<jN|HQff%fkQD%m3Qb|Ki;L>E-|M?f>}p9%R2|
z0001TNkl<Zc-rmQu?>JQ3`N1P4+~`rreYo>_Q8}iDQQUO$oDFDSARE2TCVLo_xN8w
z!C){L3<iV2U@#b*7`AsMsnln$$3!<63<iV2U@#aA27?pB_O2wA`s}qMMqSUS0E59`
mFc=I5gTY{MV%Xl5RIeAdR+l^uW^OV70000<MNUMnLSTZh!0>zk