summaryrefslogtreecommitdiffstats
path: root/src/autofit/afmodule.h
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2015-06-09 16:35:08 -0700
committerMakoto Onuki <omakoto@google.com>2015-06-10 14:52:29 -0700
commitec62c527eb34ee4481a0153ceb42dfd35d7e1d26 (patch)
tree7e67208cafc4572557e8d10469fb5dc173ca2edf /src/autofit/afmodule.h
parentb7aab0ad37ad69279e367e5960912fc3ff778233 (diff)
downloadandroid_external_freetype-ec62c527eb34ee4481a0153ceb42dfd35d7e1d26.tar.gz
android_external_freetype-ec62c527eb34ee4481a0153ceb42dfd35d7e1d26.tar.bz2
android_external_freetype-ec62c527eb34ee4481a0153ceb42dfd35d7e1d26.zip
Update to freetype 2.6.0
Bug 18751561 Change-Id: I871cc2925dc5908ec48073e11ecffad1924bbf50
Diffstat (limited to 'src/autofit/afmodule.h')
-rw-r--r--src/autofit/afmodule.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/autofit/afmodule.h b/src/autofit/afmodule.h
index 20b7b9f..b9c2fd8 100644
--- a/src/autofit/afmodule.h
+++ b/src/autofit/afmodule.h
@@ -4,7 +4,7 @@
/* */
/* Auto-fitter module implementation (specification). */
/* */
-/* Copyright 2003-2005, 2009, 2012, 2013 by */
+/* Copyright 2003-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -23,17 +23,13 @@
#include FT_INTERNAL_OBJECTS_H
#include FT_MODULE_H
-#include "afloader.h"
-
FT_BEGIN_HEADER
/*
- * This is the `extended' FT_Module structure which holds the
- * autofitter's global data. Right before hinting a glyph, the data
- * specific to the glyph's face (blue zones, stem widths, etc.) are
- * loaded into `loader' (see function `af_loader_reset').
+ * This is the `extended' FT_Module structure that holds the
+ * autofitter's global data.
*/
typedef struct AF_ModuleRec_
@@ -42,13 +38,14 @@ FT_BEGIN_HEADER
FT_UInt fallback_style;
FT_UInt default_script;
+#ifdef AF_CONFIG_OPTION_USE_WARPER
+ FT_Bool warping;
+#endif
- AF_LoaderRec loader[1];
-
- } AF_ModuleRec;
+ } AF_ModuleRec, *AF_Module;
-FT_DECLARE_MODULE(autofit_module_class)
+FT_DECLARE_MODULE( autofit_module_class )
FT_END_HEADER