From 8d5eebc0c6ada01128c6ee384340efdbef7ba29d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 12 Aug 2014 16:50:22 -0400 Subject: [PATCH] [shape-plan] Fix shape-plan caching with more than one requested shaper Wasn't breaking out of loop, ouch! http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1246370.html --- src/hb-shape-plan.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc index fa0db6a7e..23beda195 100644 --- a/src/hb-shape-plan.cc +++ b/src/hb-shape-plan.cc @@ -420,17 +420,20 @@ hb_shape_plan_create_cached (hb_face_t *face, if (shaper_list) { /* Choose shaper. Adapted from hb_shape_plan_plan(). */ #define HB_SHAPER_PLAN(shaper) \ - HB_STMT_START { \ + { \ if (hb_##shaper##_shaper_face_data_ensure (face)) \ + { \ proposal.shaper_func = _hb_##shaper##_shape; \ - } HB_STMT_END + break; \ + } \ + } for (const char * const *shaper_item = shaper_list; *shaper_item; shaper_item++) if (0) ; #define HB_SHAPER_IMPLEMENT(shaper) \ else if (0 == strcmp (*shaper_item, #shaper)) \ - HB_SHAPER_PLAN (shaper); + HB_SHAPER_PLAN (shaper) #include "hb-shaper-list.hh" #undef HB_SHAPER_IMPLEMENT