Commit cc6267722451af26c8f7d318429af6f6d6b6efef
2018-06-04T10:49:23
Restore accidentally removed, commented-out configuration options.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186
diff --git a/devel/ftoption.h b/devel/ftoption.h
index db87238..c583029 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -120,6 +120,7 @@ FT_BEGIN_HEADER
* filtering.
*
*/
+/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
/**************************************************************************
@@ -149,6 +150,7 @@ FT_BEGIN_HEADER
* that to verify that the assembler function works properly, or to
* execute benchmark tests of the various implementations.
*/
+/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */
/**************************************************************************
@@ -212,6 +214,7 @@ FT_BEGIN_HEADER
* it for certain configurations only.
*
*/
+/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
/**************************************************************************
@@ -239,6 +242,7 @@ FT_BEGIN_HEADER
* necessary such as memory loading of font files.
*
*/
+/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */
/**************************************************************************
@@ -609,8 +613,9 @@ FT_BEGIN_HEADER
*
* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
*
- * #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1
*/
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index c030a88..66bb8f9 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -123,6 +123,7 @@ FT_BEGIN_HEADER
* filtering.
*
*/
+/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
/**************************************************************************
@@ -152,6 +153,7 @@ FT_BEGIN_HEADER
* that to verify that the assembler function works properly, or to
* execute benchmark tests of the various implementations.
*/
+/* #define FT_CONFIG_OPTION_NO_ASSEMBLER */
/**************************************************************************
@@ -219,6 +221,7 @@ FT_BEGIN_HEADER
* value here with the configured one.
*
*/
+/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
/**************************************************************************
@@ -239,6 +242,7 @@ FT_BEGIN_HEADER
* value here with the configured one.
*
*/
+/* #define FT_CONFIG_OPTION_USE_BZIP2 */
/**************************************************************************
@@ -250,6 +254,7 @@ FT_BEGIN_HEADER
* necessary such as memory loading of font files.
*
*/
+/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */
/**************************************************************************
@@ -268,6 +273,7 @@ FT_BEGIN_HEADER
* value here with the configured one.
*
*/
+/* #define FT_CONFIG_OPTION_USE_PNG */
/**************************************************************************
@@ -285,6 +291,7 @@ FT_BEGIN_HEADER
* value here with the configured one.
*
*/
+/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */
/**************************************************************************
@@ -412,8 +419,9 @@ FT_BEGIN_HEADER
* Do not #undef these macros here since the build system might define
* them for certain configurations only.
*
- * #define FT_DEBUG_LEVEL_ERROR
*/
+/* #define FT_DEBUG_LEVEL_ERROR */
+/* #define FT_DEBUG_LEVEL_TRACE */
/**************************************************************************
@@ -449,6 +457,7 @@ FT_BEGIN_HEADER
* them for certain configurations only.
*
*/
+/* #define FT_DEBUG_AUTOFIT */
/**************************************************************************
@@ -467,6 +476,7 @@ FT_BEGIN_HEADER
* it for certain configurations only.
*
*/
+/* #define FT_DEBUG_MEMORY */
/**************************************************************************
@@ -638,6 +648,7 @@ FT_BEGIN_HEADER
* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
*
*/
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
@@ -760,6 +771,7 @@ FT_BEGIN_HEADER
* the type1 driver module.
*
*/
+/* #define T1_CONFIG_OPTION_OLD_ENGINE */
/*************************************************************************/
@@ -803,6 +815,7 @@ FT_BEGIN_HEADER
* the cff driver module.
*
*/
+/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
/*************************************************************************/
@@ -830,6 +843,7 @@ FT_BEGIN_HEADER
* `no-long-family-names' property of the pcf driver module.
*
*/
+/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
/*************************************************************************/
@@ -890,6 +904,7 @@ FT_BEGIN_HEADER
* This problematic commit is now reverted (more or less).
*
*/
+/* #define AF_CONFIG_OPTION_TT_SIZE_METRICS */
/* */
diff --git a/src/raster/ftraster.h b/src/raster/ftraster.h
index 8f6708d..f01bfcf 100644
--- a/src/raster/ftraster.h
+++ b/src/raster/ftraster.h
@@ -34,6 +34,7 @@ FT_BEGIN_HEADER
* standalone module, fully independent of FreeType.
*
*/
+/* #define STANDALONE_ */
FT_EXPORT_VAR( const FT_Raster_Funcs ) ft_standard_raster;