Mirrors/photocraft
1
0 Fork 0
mirror of https://github.com/storytold/photocraft.git synced 2026-11-11 00:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

address review: charge Mixd segment text before the block scan

Browse Source
This commit is contained in:
Dylan M. Taylor committed 2026-11-10 22:48:45 +00:00
1 parent c0d546983d
commit 34651cb4db
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
crates/affinity/src/text.rs
+5 -2
View File
@@ -45,10 +45,13 @@ pub(crate) fn read(r: &mut Reader, id: ObjId, world: Affine) -> Option<Text> {
r.warn("text beyond the document text budget (paragraph alignment left out)");
}
}
// `block_chars` scans the `Utf8` string, or walks each segment's `Glys` slots (nulls included): charge the scan first.
// `block_chars` scans the `Utf8` string, or walks each segment's `Glys` slots (nulls included) and `Utf8` text: charge the scan first.
let slots = match s.str(glyphs, b"Utf8") {
Some(text) => text.len(),
None => s.objs(glyphs, b"Mixd").iter().fold(0usize, |n, seg| n.saturating_add(s.array_len(*seg, b"Glys").unwrap_or(0))),
None => s
.objs(glyphs, b"Mixd")
.iter()
.fold(0usize, |n, seg| n.saturating_add(s.array_len(*seg, b"Glys").unwrap_or(0)).saturating_add(s.str(*seg, b"Utf8").map_or(0, str::len))),
};
if !r.charge_text(slots) {
r.warn("text beyond the document text budget (truncated)");