summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-07-07 09:56:43 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-07-07 09:56:43 +0000
commit750d5e56c495ac771c2180183e9fccc00f0fe6bf (patch)
treee2b12ae3c07d546028e969437ab8ca0eb6047540 /Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c
parent04ab6a8796404e13e659f596d4ae1d912a82ea0f (diff)
freetype 2.6.4
git-svn-id: svn://tug.org/texlive/trunk@41649 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c b/Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c
index bbebabdadb2..c9d4081efe3 100644
--- a/Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c
+++ b/Build/source/libs/freetype2/freetype-src/src/truetype/ttdriver.c
@@ -72,12 +72,17 @@
FT_UInt* interpreter_version = (FT_UInt*)value;
-#ifndef TT_CONFIG_OPTION_SUBPIXEL_HINTING
- if ( *interpreter_version != TT_INTERPRETER_VERSION_35 )
- error = FT_ERR( Unimplemented_Feature );
- else
+ if ( *interpreter_version == TT_INTERPRETER_VERSION_35
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+ || *interpreter_version == TT_INTERPRETER_VERSION_38
+#endif
+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+ || *interpreter_version == TT_INTERPRETER_VERSION_40
#endif
+ )
driver->interpreter_version = *interpreter_version;
+ else
+ error = FT_ERR( Unimplemented_Feature );
return error;
}