forked from pool/freetype2
- Update to 2.12.1: - Loading CFF fonts sometimes made FreeType crash (bug introduced in version 2.12.0) - Loading a fully hinted TrueType glyph a second time (without caching) sometimes yielded different rendering results if TrueType hinting was active (bug introduced in version 2.12.0). - The generation of the pkg-config file `freetype2.pc` was broken if the build was done with cmake (bug introduced in version 2.12.0). - Drop freetype-2.12.0-cff_slot_load-segfault.patch - Drop 079a22da037835daf5be2bd9eccf7bc1eaa2e783.patch - Update to version 2.12.1: * Fix clang++ warnings. * [ftsdf] Fix segmentation fault. * Replace header macros with file names. * [ftview] Handle foreground COLR. * (Print_Array): New function. * (Print_FontInfo_Dictionary, Print_FontPrivate_Dictionary): New functions. * [ftgrid] Minor tweaks. * [ftgrid] Implement embedded bitmap toggle. * Prototype SVG support. OBS-URL: https://build.opensuse.org/request/show/974364 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=176
79 lines
3.1 KiB
Diff
79 lines
3.1 KiB
Diff
temporary revert of
|
|
|
|
https://gitlab.freedesktop.org/freetype/freetype/-/commit/7809007a5b88b15207d6c6680cd8a979b122eafa.patch
|
|
due to https://gitlab.freedesktop.org/freetype/freetype/-/issues/1148
|
|
|
|
Index: freetype-2.12.1/src/truetype/ttgload.c
|
|
===================================================================
|
|
--- freetype-2.12.1.orig/src/truetype/ttgload.c
|
|
+++ freetype-2.12.1/src/truetype/ttgload.c
|
|
@@ -2691,28 +2691,6 @@
|
|
exec->ignore_x_mode = FALSE;
|
|
#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
|
|
|
|
-#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
|
|
- /*
|
|
- * Toggle backward compatibility according to what font wants, except
|
|
- * when
|
|
- *
|
|
- * 1) we have a `tricky' font that heavily relies on the interpreter to
|
|
- * render glyphs correctly, for example DFKai-SB, or
|
|
- * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested.
|
|
- *
|
|
- * In those cases, backward compatibility needs to be turned off to get
|
|
- * correct rendering. The rendering is then completely up to the
|
|
- * font's programming.
|
|
- *
|
|
- */
|
|
- if ( driver->interpreter_version == TT_INTERPRETER_VERSION_40 &&
|
|
- subpixel_hinting_lean &&
|
|
- !FT_IS_TRICKY( glyph->face ) )
|
|
- exec->backward_compatibility = !( exec->GS.instruct_control & 4 );
|
|
- else
|
|
- exec->backward_compatibility = FALSE;
|
|
-#endif /* TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL */
|
|
-
|
|
exec->pedantic_hinting = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
|
|
loader->exec = exec;
|
|
loader->instructions = exec->glyphIns;
|
|
Index: freetype-2.12.1/src/truetype/ttinterp.c
|
|
===================================================================
|
|
--- freetype-2.12.1.orig/src/truetype/ttinterp.c
|
|
+++ freetype-2.12.1/src/truetype/ttinterp.c
|
|
@@ -7762,6 +7762,35 @@
|
|
#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
|
|
|
|
|
|
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
|
|
+ exc->iup_called = FALSE;
|
|
+#endif /* TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY */
|
|
+
|
|
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
|
|
+ /*
|
|
+ * Toggle backward compatibility according to what font wants, except
|
|
+ * when
|
|
+ *
|
|
+ * 1) we have a `tricky' font that heavily relies on the interpreter to
|
|
+ * render glyphs correctly, for example DFKai-SB, or
|
|
+ * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested.
|
|
+ *
|
|
+ * In those cases, backward compatibility needs to be turned off to get
|
|
+ * correct rendering. The rendering is then completely up to the
|
|
+ * font's programming.
|
|
+ *
|
|
+ */
|
|
+ if ( SUBPIXEL_HINTING_MINIMAL &&
|
|
+ exc->subpixel_hinting_lean &&
|
|
+ !FT_IS_TRICKY( &exc->face->root ) )
|
|
+ exc->backward_compatibility = !( exc->GS.instruct_control & 4 );
|
|
+ else
|
|
+ exc->backward_compatibility = FALSE;
|
|
+
|
|
+ exc->iupx_called = FALSE;
|
|
+ exc->iupy_called = FALSE;
|
|
+#endif
|
|
+
|
|
/* We restrict the number of twilight points to a reasonable, */
|
|
/* heuristic value to avoid slow execution of malformed bytecode. */
|
|
num_twilight_points = FT_MAX( 30,
|