From: Øyvind Kolås Date: Wed, 29 Aug 2018 21:51:50 +0000 (+0200) Subject: babl-fish-reference: disable a fast-code path that sometimes is invalid X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~14^2~21 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1178aceac240d13f4cc184d520bac81ab77564ae;p=babl.git babl-fish-reference: disable a fast-code path that sometimes is invalid --- diff --git a/babl/babl-fish-reference.c b/babl/babl-fish-reference.c index 7ae5455..c813225 100644 --- a/babl/babl-fish-reference.c +++ b/babl/babl-fish-reference.c @@ -758,7 +758,7 @@ babl_fish_reference_process (const Babl *babl, else { source_float_buf_alloc = babl_malloc (sizeof (float) * n * - BABL (babl->fish.source)->format.model->components); + (BABL (babl->fish.source)->format.model->components)); source_float_buf = source_float_buf_alloc; source_image = babl_image_from_linear ( @@ -773,7 +773,7 @@ babl_fish_reference_process (const Babl *babl, ); } - if (babl_model_is ((void*)babl->fish.source->format.model, "RGBA")) + if (babl_model_is ((void*)babl->fish.source->format.model, "RGBA") && 0) { rgba_float_buf = source_float_buf; rgba_image = babl_image_from_linear ( diff --git a/babl/babl-fish.c b/babl/babl-fish.c index a1baa50..0976de6 100644 --- a/babl/babl-fish.c +++ b/babl/babl-fish.c @@ -119,6 +119,7 @@ babl_conversion_find (const void *source, const void *destination) { void *data = (void*)destination; + babl_list_each (BABL (source)->type.from_list, match_conversion, &data); if (data != (void*)destination) /* didn't change */ return data;