diff options
| author | Werner Lemberg <wl@gnu.org> | 2002-04-30 14:26:49 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2002-04-30 14:26:49 +0000 |
| commit | 9ca7a157273201e4e40168e7b239e12bb813f9a7 (patch) | |
| tree | f1a5e7237041b664869a22e7984b30047924f7bd /include | |
| parent | 5f0ee94c06156e1c0d45c6add8a8716262c866d4 (diff) | |
| download | freetype2-9ca7a157273201e4e40168e7b239e12bb813f9a7.tar.gz | |
* src/base/ftmac.c (p2c_str): Removed.
(file_spec_from_path) [TARGET_API_MAC_CARBON]: Added support for
OS X.
(is_dfont) [TARGET_API_MAC_CARBON]: Define only for OS X.
Handle `nameLen' <= 6 also.
(parse_fond): Remove unused variable `name_table'.
Use functionality of old p2c_str directly.
Add safety checks.
(read_lwfn): Initialize `size_p'.
Check for size_p == NULL.
(new_memory_stream, open_face_from_buffer): Updated to FreeType 2.1.
(FT_New_Face_From_LWFN): Remove unused variable `memory'.
Remove some dead code.
(FT_New_Face_From_SFNT): Remove unused variable `stream'.
(FT_New_Face_From_dfont) [TARGET_API_MAC_CARBON]: Define only for
OS X.
(FT_New_Face_From_FOND): Remove unused variable `error'.
(ResourceForkSize): New function.
(FT_New_Face): Use it.
Handle empty resource forks.
Conditionalize some code for OS X.
Add code to call normal loader as a fallback.
Some more variable renames to avoid troubles on the Mac.
* src/raster/ftraster.c:
s/Unknown|Ascending|Descending|Flat/\1_State/.
* src/smooth/ftgrays.c: s/TScan/TCoord/.
Other changes for the Mac.
* include/freetype/config/ftconfig.h: Define FT_MACINTOSH for
Mac platforms.
* src/base/ftobjs.c: s/macintosh/FT_MACINTOSH/.
* src/raster/ftrend1.c (ft_raster1_render): Make `pitch' always
an even number.
Diffstat (limited to 'include')
| -rw-r--r-- | include/freetype/config/ftconfig.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 3e76bc9d6..72bee0cc5 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -103,6 +103,18 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ + /* Mac support */ + /* */ + /* This is the only necessary change, so it is defined here instead */ + /* providing a new configuration file. */ + /* */ +#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) ) +#define FT_MACINTOSH 1 +#endif + + + /*************************************************************************/ + /* */ /* IntN types */ /* */ /* Used to guarantee the size of some specific integers. */ |