From: Øyvind Kolås Date: Sat, 23 May 2020 16:53:36 +0000 (+0200) Subject: babl: search depth of 2 and 4, instead of 2 and 5 X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~9^2~12 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ebe30e43559d24865f6ba5c32c6b2d07a9ef3b1;p=babl.git babl: search depth of 2 and 4, instead of 2 and 5 Conversions needed for color management in GIMP are not feasible in 2 steps, searching 5 deep for commonly used conversions causes severe UI stalls, lowering the max search depth to 4 avoids this regression introduced in 51437f216dbbef80f9bf661dd152452083119349, while keeping the speed-up for other cases. --- diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c index 7a55d44..ab43616 100644 --- a/babl/babl-fish-path.c +++ b/babl/babl-fish-path.c @@ -603,10 +603,10 @@ babl_fish_path2 (const Babl *source, get_conversion_path (&pc, (Babl *) source, 0, max_path_length (), tolerance); - /* attempt with path length + 3 */ + /* attempt with path length + 2 */ if (babl->fish_path.conversion_list->count == 0) { - int max_length = max_path_length () + 3; + int max_length = max_path_length () + 2; if (max_length > BABL_HARD_MAX_PATH_LENGTH) max_length = BABL_HARD_MAX_PATH_LENGTH;