[truetype] Treat 38 as 40 without Infinality.

* include/freetype/ftdriver.h (TT_INTERPRETER_VERSION_38): Reinstate.
* src/truetype/ttdriver.c (tt_property_set): Fallback from 38 to 40.
This commit is contained in:
Alexei Podtelezhnikov 2023-02-27 21:54:23 -05:00
parent 2257f9abf6
commit 638df2fe32
2 changed files with 17 additions and 7 deletions

View File

@ -757,7 +757,7 @@ FT_BEGIN_HEADER
* *
*/ */
#define TT_INTERPRETER_VERSION_35 35 #define TT_INTERPRETER_VERSION_35 35
#define TT_INTERPRETER_VERSION_38 40 #define TT_INTERPRETER_VERSION_38 38
#define TT_INTERPRETER_VERSION_40 40 #define TT_INTERPRETER_VERSION_40 40

View File

@ -93,17 +93,27 @@
interpreter_version = *iv; interpreter_version = *iv;
} }
if ( interpreter_version == TT_INTERPRETER_VERSION_35 switch ( interpreter_version )
{
case TT_INTERPRETER_VERSION_35:
driver->interpreter_version = TT_INTERPRETER_VERSION_35;
break;
case TT_INTERPRETER_VERSION_38:
#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
|| interpreter_version == TT_INTERPRETER_VERSION_38 driver->interpreter_version = TT_INTERPRETER_VERSION_38;
break;
#endif #endif
case TT_INTERPRETER_VERSION_40:
#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
|| interpreter_version == TT_INTERPRETER_VERSION_40 driver->interpreter_version = TT_INTERPRETER_VERSION_40;
break;
#endif #endif
)
driver->interpreter_version = interpreter_version; default:
else
error = FT_ERR( Unimplemented_Feature ); error = FT_ERR( Unimplemented_Feature );
}
return error; return error;
} }