shithub: fnt

Download patch

ref: 2296ee3d37775d6cfd87ed27dfee46cb9b85b12b
parent: f16c52c353075a9841a74c3d5cb4643448eb87fa
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Mon Sep 2 16:37:46 EDT 2024 

bitglyf: fix wrong subtables walk logic


--- a/otf.c.in
+++ b/otf.c.in
@@ -685,10 +685,10 @@
 		b.ppemY = bs->ppemY;
 		isr = bs->indexSubtableList;
 		for(j = 0; j < (int)bs->numberOfIndexSubtables; j++, isr++){
-			if(g->index < isr->firstGlyphIndex || (is = isr->indexSubtable) == nil)
-				continue;
-			if(g->index > isr->lastGlyphIndex)
+			if(g->index < isr->firstGlyphIndex)
 				break;
+			if(g->index > isr->lastGlyphIndex || (is = isr->indexSubtable) == nil)
+				continue;
 
 			b.format = is->imageFormat;
 			b.offset = is->imageDataOffset;
--- a/plan9/otf.c
+++ b/plan9/otf.c
@@ -686,10 +686,10 @@
 		b.ppemY = bs->ppemY;
 		isr = bs->indexSubtableList;
 		for(j = 0; j < (int)bs->numberOfIndexSubtables; j++, isr++){
-			if(g->index < isr->firstGlyphIndex || (is = isr->indexSubtable) == nil)
-				continue;
-			if(g->index > isr->lastGlyphIndex)
+			if(g->index < isr->firstGlyphIndex)
 				break;
+			if(g->index > isr->lastGlyphIndex || (is = isr->indexSubtable) == nil)
+				continue;
 
 			b.format = is->imageFormat;
 			b.offset = is->imageDataOffset;
@@ -828,7 +828,6 @@
 		if(o->td.eblc == nil && o->td.ebdt == nil)
 			return g;
 	}
-
 	if(o->td.eblc != nil && o->td.ebdt != nil)
 		return bitglyf(o, g, opts);