freetype: roll back to freetype version 2.9.1

tag VER-2-9-1 Starting with freetype 2.10.0, the sum of the ascent and descent values seem to be more likely to be less than the baseline-to-baseline measurement (called the font's height), which is the font designer's recommend distance between baselines. However, OpenFL doesn't account for the full baseline-to-baseline height at all, so with smaller ascent and descent values, lines render with smaller gaps between them. OpenFL needs to update its TextEngine algorithm to use the height of the line instead of adding ascent and descent together alone, and then we can update freetype. Updating TextEngine is not a trivial change, and may likely require time to discover bugs and stabilize, so it's better to roll back the freetype update for now, and apply it again later after OpenFL can handle it properly.
openfl · Oct 29, 2024 · c4faf58 · c4faf58
1 parent e65e863
commit c4faf58
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/project/lib/freetype b/project/lib/freetype
diff --git a/project/lib/freetype-files.xml b/project/lib/freetype-files.xml
@@ -110,7 +110,13 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/bdf/bdf.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/bzip2/ftbzip2.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cache/ftcache.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cff.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffcmap.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffdrivr.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffgload.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffload.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffobjs.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffparse.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffpic.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cid/type1cid.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/gzip/ftgzip.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/lzw/ftlzw.c" />
@@ -120,13 +126,8 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/pshinter/pshinter.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/psnames/psmodule.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/raster/raster.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftbsdf.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdf.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdfcommon.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdfrend.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sfnt/sfnt.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/smooth/smooth.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/svg/ftsvg.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/truetype/truetype.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/type1/type1.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/type42/type42.c" />