[base] fix logic

5 years ago · 87454c447d
parent 69655d5bc3
commit 87454c447d
1 changed files with 3 additions and 3 deletions
--- a/src/hb-ot-layout-base-table.hh
+++ b/src/hb-ot-layout-base-table.hh
@ -450,11 +450,11 @@ struct BASE
 		     hb_position_t           *base) const
  {
    const BaseCoord *base_coord = nullptr;
-    if (unlikely (!get_axis (direction).get_baseline (baseline, script_tag, language_tag, &base_coord) &&
-		  base_coord && !base_coord->has_data ()))
+    if (unlikely (!get_axis (direction).get_baseline (baseline, script_tag, language_tag, &base_coord) ||
+		  !base_coord || !base_coord->has_data ()))
      return false;

-    if (likely (base && base_coord))
+    if (likely (base))
      *base = base_coord->get_coord (font, get_var_store (), direction);

    return true;