aboutsummaryrefslogtreecommitdiff
path: root/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-10-18 23:52:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-10-18 23:52:49 +0000
commite5c82fbba2b2dfbc3fefbd8db0c97cd8379eec0c (patch)
tree9212cc84b2d1ce6335f4c3b94dc3e2ecc306c638 /src/OT/Layout/GPOS/MarkBasePosFormat1.hh
parent6e7e838ab29f4c1421dd8d23512e0a2726d09058 (diff)
parent974d6cfdff7b32a22acf8714b0c34b113ffb71a0 (diff)
downloadharfbuzz_ng-e5c82fbba2b2dfbc3fefbd8db0c97cd8379eec0c.tar.gz
Merge "Update HarfBuzz to 8.2.2" into main
Diffstat (limited to 'src/OT/Layout/GPOS/MarkBasePosFormat1.hh')
-rw-r--r--src/OT/Layout/GPOS/MarkBasePosFormat1.hh15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
index eb4712049..1b8f3c80a 100644
--- a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
+++ b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
@@ -197,9 +197,10 @@ struct MarkBasePosFormat1_2
if (!out->markCoverage.serialize_serialize (c->serializer, new_coverage.iter ()))
return_trace (false);
- out->markArray.serialize_subset (c, markArray, this,
- (this+markCoverage).iter (),
- &klass_mapping);
+ if (unlikely (!out->markArray.serialize_subset (c, markArray, this,
+ (this+markCoverage).iter (),
+ &klass_mapping)))
+ return_trace (false);
unsigned basecount = (this+baseArray).rows;
auto base_iter =
@@ -228,11 +229,9 @@ struct MarkBasePosFormat1_2
;
}
- out->baseArray.serialize_subset (c, baseArray, this,
- base_iter.len (),
- base_indexes.iter ());
-
- return_trace (true);
+ return_trace (out->baseArray.serialize_subset (c, baseArray, this,
+ base_iter.len (),
+ base_indexes.iter ()));
}
};