Commit 2d1601930d5363d53d9a5c2cbb8d3ff3fe6d32e2
2003-04-22T05:51:31
Cleanups.
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 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285
diff --git a/ChangeLog b/ChangeLog
index ebbf9ea..9d5e627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -319,6 +319,9 @@
FT_RENDER_MODE_LIGHT hinting mode in the auto and postscript
hinters.
+ * include/freetype/freetype.h (FT_Render_Mode): Add
+ FT_RENDER_MODE_LIGHT.
+
* src/truetype/ttgload.c: Fixing the TrueType loader to handle
invalid composites correctly by limiting the recursion depth.
@@ -432,6 +435,11 @@
produces slightly better shapes though this is not distinguishable
with many fonts.
+2002-11-06 David Turner <david@freetype.org>
+
+ * include/freetype/freetype.h (FT_LOAD_TARGET_LIGHT): New macro.
+ (FT_LOAD_TARGET, FT_LOAD_TARGET_MODE): Use `& 15' instead of `& 7'.
+
2002-11-05 David Turner <david@freetype.org>
* include/freetype/config/ftoption.h, src/gzip/ftgzip.c: Added
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 0827591..6d366a0 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -22,11 +22,6 @@
#include <ft2build.h>
- /*
- * This is a special developer version of "ftoption.h". It is used
- * to define all debugging options, as well as the TrueType bytecode
- * interpreter.
- */
FT_BEGIN_HEADER
@@ -86,16 +81,16 @@ FT_BEGIN_HEADER
/* by FreeType to speed up some computations. However, this will create */
/* some problems when compiling the library in strict ANSI mode. */
/* */
- /* For this reason, the use of 64-bit ints is normally disabled when */
+ /* For this reason, the use of 64-bit integers is normally disabled when */
/* the __STDC__ macro is defined. You can however disable this by */
- /* defining here the macro FT_CONFIG_OPTION_FORCE_INT64. */
+ /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here. */
/* */
- /* For most compilers, this will only create compilation warnings */
- /* when building the library. */
+ /* For most compilers, this will only create compilation warnings when */
+ /* building the library. */
/* */
/* ObNote: The compiler-specific 64-bit integers are detected in the */
- /* file "ftconfig.h" either statically, or through Autoconf */
- /* on platforms that support it. */
+ /* file "ftconfig.h" either statically or through the */
+ /* `configure' script on supported platforms. */
/* */
#undef FT_CONFIG_OPTION_FORCE_INT64
@@ -105,11 +100,11 @@ FT_BEGIN_HEADER
/* Gzip-compressed file support. */
/* */
/* FreeType now handles font files that have been compressed with the */
- /* 'gzip' program. This is mostly used to parse many of the PCF files */
- /* that come with XFree86. The implementation uses 'zlib' to */
+ /* 'gzip' program. This is mostly used to parse many of the PCF files */
+ /* that come with XFree86. The implementation uses `zlib' to */
/* partially uncompress the file on the fly (see src/base/ftgzip.c). */
/* */
- /* Define this macro if you want to enable this "feature". Note that */
+ /* Define this macro if you want to enable this "feature". Note that */
/* this will however force you to link the zlib to any program that */
/* also uses FreeType. */
/* */
@@ -122,17 +117,17 @@ FT_BEGIN_HEADER
/* */
/* This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined. */
/* It allows FreeType's "ftgzip" component to link to the system's */
- /* installation of the ZLib library. This is useful on systems like */
+ /* installation of the ZLib library. This is useful on systems like */
/* Unix or VMS where it generally is already available. */
/* */
/* If you let it undefined, the component will use its own copy */
- /* of the zlib sources instead. These have been modified to be */
+ /* of the zlib sources instead. These have been modified to be */
/* included directly within the component and *not* export external */
- /* function names. This allows you to link any program with FreeType */
+ /* function names. This allows you to link any program with FreeType */
/* _and_ ZLib without linking conflicts. */
/* */
- /* do not #undef this macro here, since the build system might */
- /* define for certain configurations */
+ /* Do not #undef this macro here since the build system might define */
+ /* it for certain configurations only. */
/* */
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
@@ -172,6 +167,9 @@ FT_BEGIN_HEADER
/* will be later automatically defined as `extern return_type' to */
/* allow normal compilation. */
/* */
+ /* Do not #undef these macros here since the build system might define */
+ /* them for certain configurations only. */
+ /* */
/* #define FT_EXPORT(x) extern x */
/* #define FT_EXPORT_DEF(x) x */
@@ -226,7 +224,7 @@ FT_BEGIN_HEADER
/* This allows FreeType to be used with the PostScript language, using */
/* the GhostScript interpreter. */
/* */
-/* #define FT_CONFIG_OPTION_INCREMENTAL */
+/* #define FT_CONFIG_OPTION_INCREMENTAL */
/*************************************************************************/
@@ -234,7 +232,7 @@ FT_BEGIN_HEADER
/* The size in bytes of the render pool used by the scan-line converter */
/* to do all of its work. */
/* */
- /* This must be greater than 4kByte. */
+ /* This must be greater than 4KByte. */
/* */
#define FT_RENDER_POOL_SIZE 16384L
@@ -263,8 +261,11 @@ FT_BEGIN_HEADER
/* */
/* Don't define any of these macros to compile in `release' mode! */
/* */
-#define FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_TRACE
+ /* 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_TRACE
/*************************************************************************/
@@ -279,8 +280,10 @@ FT_BEGIN_HEADER
/* Note that the memory debugger is only activated at runtime when */
/* when the _environment_ variable "FT_DEBUG_MEMORY" is also defined! */
/* */
-#define FT_DEBUG_MEMORY
-
+ /* Do not #undef this macro here since the build system might define */
+ /* it for certain configurations only. */
+ /* */
+#define FT_DEBUG_MEMORY
/*************************************************************************/
@@ -380,8 +383,8 @@ FT_BEGIN_HEADER
/* By undefining this, you will only compile the code necessary to load */
/* TrueType glyphs without hinting. */
/* */
- /* do not #undef this macro here, since the build system might */
- /* define for certain configurations */
+ /* Do not #undef this macro here, since the build system might */
+ /* define it for certain configurations only. */
/* */
#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
@@ -475,21 +478,21 @@ FT_BEGIN_HEADER
/* */
/*
- * the FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
- * improvements to the auto-hinter contributed by David Chester. They will
- * most likely disappear completely in the next release. For now, you should
- * always keep them defined
+ * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
+ * improvements to the auto-hinter contributed by David Chester. They will
+ * most likely disappear completely in the next release. For now, you
+ * should always keep them defined.
*
*/
#define FT_CONFIG_OPTION_CHESTER_HINTS
#ifdef FT_CONFIG_OPTION_CHESTER_HINTS
-# define FT_CONFIG_CHESTER_SMALL_F
-# define FT_CONFIG_CHESTER_ASCENDER
-# define FT_CONFIG_CHESTER_SERIF
-# define FT_CONFIG_CHESTER_STEM
-# define FT_CONFIG_CHESTER_BLUE_SCALE
+#define FT_CONFIG_CHESTER_SMALL_F
+#define FT_CONFIG_CHESTER_ASCENDER
+#define FT_CONFIG_CHESTER_SERIF
+#define FT_CONFIG_CHESTER_STEM
+#define FT_CONFIG_CHESTER_BLUE_SCALE
#endif /* FT_CONFIG_OPTION_CHESTER_HINTS */
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 4d6c5a2..96979bb 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -4,7 +4,7 @@
/* */
/* FreeType high-level API and common types (specification only). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -1492,15 +1492,15 @@ FT_BEGIN_HEADER
/* */
/* FT_OPEN_PARAMS :: Use the `num_params' & `params' field. */
/* */
- /* ft_open_memory :: deprecated. use @FT_OPEN_MEMORY instead */
+ /* ft_open_memory :: Deprecated. use @FT_OPEN_MEMORY instead. */
/* */
- /* ft_open_stream :: deprecated. use @FT_OPEN_STREAM instead */
+ /* ft_open_stream :: Deprecated. use @FT_OPEN_STREAM instead. */
/* */
- /* ft_open_pathname :: deprecated. use @FT_OPEN_PATHNAME instead */
+ /* ft_open_pathname :: Deprecated. use @FT_OPEN_PATHNAME instead. */
/* */
- /* ft_open_driver :: deprecated, use @FT_OPEN_DRIVER instead */
+ /* ft_open_driver :: Deprecated, use @FT_OPEN_DRIVER instead. */
/* */
- /* ft_open_params :: deprecated, use @FT_OPEN_PARAMS instead */
+ /* ft_open_params :: Deprecated, use @FT_OPEN_PARAMS instead. */
/* */
/* <Note> */
/* The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME' */
@@ -1516,11 +1516,11 @@ FT_BEGIN_HEADER
} FT_Open_Flags;
-#define ft_open_memory FT_OPEN_MEMORY /* deprecated */
-#define ft_open_stream FT_OPEN_STREAM /* deprecated */
-#define ft_open_pathname FT_OPEN_PATHNAME /* deprecated */
-#define ft_open_driver FT_OPEN_DRIVER /* deprecated */
-#define ft_open_params FT_OPEN_PARAMS /* deprecated */
+#define ft_open_memory FT_OPEN_MEMORY /* deprecated */
+#define ft_open_stream FT_OPEN_STREAM /* deprecated */
+#define ft_open_pathname FT_OPEN_PATHNAME /* deprecated */
+#define ft_open_driver FT_OPEN_DRIVER /* deprecated */
+#define ft_open_params FT_OPEN_PARAMS /* deprecated */
/*************************************************************************/
@@ -2212,11 +2212,10 @@ FT_BEGIN_HEADER
/* */
/* FT_RENDER_MODE_LIGHT :: */
/* This is similar to @FT_RENDER_MODE_NORMAL, except that this */
- /* changes the hinting to prevent stem width quantization. This */
+ /* changes the hinting to prevent stem width quantization. This */
/* results in glyph shapes that are more similar to the original, */
/* while being a bit more fuzzy ("better shapes", instead of */
- /* "better contrast" if you want :-) THIS IS STILL EXPERIMENTAL, */
- /* FOR NOW, THIS WILL PRODUCE RESULTS SIMILAR TO NORMAL MODE !! */
+ /* "better contrast" if you want :-). */
/* */
/* FT_RENDER_MODE_MONO :: */
/* This mode corresponds to 1-bit bitmaps. */
@@ -2225,8 +2224,7 @@ FT_BEGIN_HEADER
/* This mode corresponds to horizontal RGB/BGR sub-pixel displays, */
/* like LCD-screens. It produces 8-bit bitmaps that are 3 times */
/* the width of the original glyph outline in pixels, and which use */
- /* the @FT_PIXEL_MODE_LCD mode. THIS IS STILL EXPERIMENTAL, DO NOT */
- /* USE FOR NOW !! */
+ /* the @FT_PIXEL_MODE_LCD mode. */
/* */
/* FT_RENDER_MODE_LCD_V :: */
/* This mode corresponds to vertical RGB/BGR sub-pixel displays */
@@ -2237,8 +2235,7 @@ FT_BEGIN_HEADER
/* <Note> */
/* The LCD-optimized glyph bitmaps produced by FT_Render_Glyph are */
/* _not filtered_ to reduce color-fringes. It is up to the caller to */
- /* perform this pass. THIS IS STILL EXPERIMENTAL, DO NOT USE FOR NOW */
- /* !! */
+ /* perform this pass. */
/* */
typedef enum FT_Render_Mode_
{