Commit de6e145b authored by Werner Lemberg's avatar Werner Lemberg
Browse files

* */*.h: Changed body inclusion macro names to start and end with

`__' (those which haven't converted yet).  Fixed minor conversion
issues.

* src/winfonts/winfnt.c: Updated to new header inclusion scheme.

* */*.[ch]: Changed source files to adhere to the new
* src/cff/cff.c, src/cff/rules.mk: Updated.

* */*.[ch]: Now using <ft2build.h> as the default build and setup
parent 4878fe65
2000-12-08 Werner Lemberg <wl@gnu.org>
* */*.h: Changed body inclusion macro names to start and end with
`__' (those which haven't converted yet). Fixed minor conversion
issues.
* src/winfonts/winfnt.c: Updated to new header inclusion scheme.
2000-12-07 David Turner <david.turner@freetype.org>
* many files: Changed source files to adhere to the new
* */*.[ch]: Changed source files to adhere to the new
header inclusion scheme. Not completely tested but works for now
here.
......@@ -23,6 +31,8 @@
* src/cff/t2tokens.h: Renamed and updated to...
* src/cff/cfftoken.h: New file.
* src/cff/cff.c, src/cff/rules.mk: Updated.
2000-12-06 David Turner <david.turner@freetype.org>
* src/cache/ftlru.c (FT_Lru_Done): Fixed memory leak.
......@@ -58,7 +68,7 @@
is now installed as <ft2build.h> for Unix systems. Note that we
still use the "freetype2/freetype" installation path for now.
* many files: Now using <ft2build.h> as the default build and setup
* */*.[ch]: Now using <ft2build.h> as the default build and setup
configuration file in all public headers. Internal source files
still need some changes though.
......
......@@ -45,10 +45,12 @@
#ifndef __FTCCHUNK_H__
#define __FTCCHUNK_H__
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_MANAGER_H
FT_BEGIN_HEADER
......
......@@ -53,10 +53,13 @@
#ifndef __FTCGLYPH_H__
#define __FTCGLYPH_H__
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_MANAGER_H
#include <stddef.h>
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_MANAGER_H
#include <stddef.h>
FT_BEGIN_HEADER
......@@ -198,6 +201,7 @@ FT_BEGIN_HEADER
FT_UInt gindex,
FTC_GlyphNode *anode );
FT_END_HEADER
#endif /* __FTCGLYPH_H__ */
......
/***************************************************************************/
/* */
/* ftcimage.c */
/* ftcimage.h */
/* */
/* FreeType Image cache (body). */
/* */
......@@ -26,9 +26,11 @@
#ifndef __FTCIMAGE_H__
#define __FTCIMAGE_H__
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_GLYPH_H
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_GLYPH_H
FT_BEGIN_HEADER
......
......@@ -62,12 +62,15 @@
#ifndef __FTCMANAG_H__
#define __FTCMANAG_H__
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_LRU_H
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_LRU_H
FT_BEGIN_HEADER
#define FTC_MAX_FACES_DEFAULT 2
#define FTC_MAX_SIZES_DEFAULT 4
#define FTC_MAX_BYTES_DEFAULT 200000 /* 200kByte by default! */
......@@ -359,6 +362,7 @@ FT_BEGIN_HEADER
/* */
FT_END_HEADER
#endif /* __FTCMANAG_H__ */
......
......@@ -19,10 +19,13 @@
#ifndef __FTCSBITS_H__
#define __FTCSBITS_H__
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_CHUNK_H
#include FT_CACHE_IMAGE_H
#include <ft2build.h>
#include FT_CACHE_H
#include FT_CACHE_INTERNAL_CHUNK_H
#include FT_CACHE_IMAGE_H
FT_BEGIN_HEADER
......@@ -57,6 +60,7 @@ FT_BEGIN_HEADER
FTC_Image_Desc* desc,
FT_UInt gindex,
FTC_SBit *sbit );
FT_END_HEADER
#endif /* __FTCSBITS_H__ */
......
......@@ -58,8 +58,10 @@
#ifndef __FTLRU_H__
#define __FTLRU_H__
#include <ft2build.h>
#include FT_FREETYPE_H
#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
......@@ -162,6 +164,7 @@ FT_BEGIN_HEADER
FT_Lru_Selector selector,
FT_Pointer data );
FT_END_HEADER
#endif /* __FTLRU_H__ */
......
......@@ -13,28 +13,30 @@
/* this file you indicate that you have read the license and */
/* understand and accept it fully. */
/* */
/* */
/* This file corresponds to the default "ft2build.h" file for */
/* FreeType 2. It uses the "freetype" include root. */
/* */
/* Note that specific platforms might use a different configurations. */
/* For example, on Unix, the "freetype2" include root is used, with */
/* a specific "ft2build.h" used to take care of this. The latter */
/* looks like the following: */
/* */
/* */
/* #ifndef __FT_BUILD_UNIX_H__ */
/* #define __FT_BUILD_UNIX_H__ */
/* */
/* #define FT2_ROOT freetype2 */
/* #include <FT2_ROOT/config/ft2build.h> */
/* */
/* #endif // __FT_BUILD_UNIX_H__ */
/* */
/* */
/***************************************************************************/
/*************************************************************************/
/* */
/* This file corresponds to the default "ft2build.h" file for */
/* FreeType 2. It uses the "freetype" include root. */
/* */
/* Note that specific platforms might use a different configurations. */
/* For example, on Unix, the "freetype2" include root is used, with a */
/* specific "ft2build.h" used to take care of this. The latter looks */
/* like the following: */
/* */
/* #ifndef __FT_BUILD_UNIX_H__ */
/* #define __FT_BUILD_UNIX_H__ */
/* */
/* #define FT2_ROOT freetype2 */
/* #include <FT2_ROOT/config/ft2build.h> */
/* */
/* #endif // __FT_BUILD_UNIX_H__ */
/* */
/*************************************************************************/
#ifndef __FT2_BUILD_H__
#define __FT2_BUILD_H__
......
......@@ -39,11 +39,13 @@
#ifndef __FTCONFIG_H__
#define __FTCONFIG_H__
#include <ft2build.h>
#include FT_CONFIG_OPTIONS_H
#include <ft2build.h>
#include FT_CONFIG_OPTIONS_H
FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* PLATFORM-SPECIFIC CONFIGURATION MACROS */
......
......@@ -16,13 +16,14 @@
/***************************************************************************/
#ifndef FTOPTION_H
#define FTOPTION_H
#ifndef __FTOPTION_H__
#define __FTOPTION_H__
#ifdef __cplusplus
extern "C" {
#endif
#include <ft2build.h>
FT_BEGIN_HEADER
/*************************************************************************/
......@@ -389,12 +390,10 @@
#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
#ifdef __cplusplus
}
#endif
FT_END_HEADER
#endif /* FTOPTION_H */
#endif /* __FTOPTION_H__ */
/* END */
......@@ -19,6 +19,7 @@
#ifndef __FREETYPE_H__
#define __FREETYPE_H__
/*************************************************************************/
/* */
/* The `raster' component duplicates some of the declarations in */
......@@ -42,8 +43,10 @@
#include FT_ERRORS_H
#include FT_TYPES_H
FT_BEGIN_HEADER
/*************************************************************************/
/*************************************************************************/
/* */
......@@ -2283,6 +2286,7 @@ FT_BEGIN_HEADER
/* */
FT_END_HEADER
#endif /* __FREETYPE_H__ */
......
......@@ -30,11 +30,14 @@
#ifndef FTBBOX_H
#define FTBBOX_H
#include <ft2build.h>
#include FT_FREETYPE_H
#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Function> */
......@@ -62,6 +65,7 @@ FT_BEGIN_HEADER
/* */
FT_END_HEADER
#endif /* FTBBOX_H */
......
......@@ -34,11 +34,14 @@
#ifndef __FTCACHE_H__
#define __FTCACHE_H__
#include <ft2build.h>
#include FT_GLYPH_H
#include <ft2build.h>
#include FT_GLYPH_H
FT_BEGIN_HEADER
#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
......
......@@ -23,7 +23,7 @@
/* something like */
/* */
/* { */
/* #undef FTERRORS_H */
/* #undef __FTERRORS_H__ */
/* #define FT_ERRORDEF( e, v, s ) { e, s }, */
/* #define FT_ERROR_START_LIST { */
/* #define FT_ERROR_END_LIST { 0, 0 } }; */
......@@ -34,7 +34,7 @@
/* const char* err_msg */
/* } ft_errors[] = */
/* */
/* #include <freetype/fterrors.h> */
/* #include FT_ERRORS_H */
/* } */
/* */
/* For C++ it might be necessary to use `extern "C" {' and to define */
......
......@@ -32,8 +32,10 @@
#ifndef __FTGLYPH_H__
#define __FTGLYPH_H__
#include <ft2build.h>
#include FT_FREETYPE_H
#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
......
......@@ -30,6 +30,7 @@
#include <ft2build.h>
FT_BEGIN_HEADER
......@@ -994,7 +995,6 @@ FT_BEGIN_HEADER
FT_END_HEADER
#endif /* __FTIMAGE_H__ */
......
/***************************************************************************/
/* */
/* ftlist.c */
/* ftlist.h */
/* */
/* Generic list support for FreeType (specification). */
/* */
......@@ -27,8 +27,10 @@
#ifndef __FTLIST_H__
#define __FTLIST_H__
#include <ft2build.h>
#include FT_FREETYPE_H
#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
......@@ -216,4 +218,5 @@ FT_END_HEADER
#endif /* __FTLIST_H__ */
/* END */
......@@ -29,9 +29,10 @@
#define __FT_MAC_H__
#ifdef __cplusplus
extern "C" {
#endif
#include <ft2build.h>
FT_BEGIN_HEADER
/*************************************************************************/
......@@ -70,9 +71,7 @@
FT_Face *aface );
#ifdef __cplusplus
}
#endif
FT_END_HEADER
#endif /* __FT_MAC_H__ */
......
......@@ -19,11 +19,14 @@
#ifndef __FTMM_H__
#define __FTMM_H__
#include <ft2build.h>
#include FT_TYPE1_TABLES_H
#include <ft2build.h>
#include FT_TYPE1_TABLES_H
FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Struct> */
......
......@@ -19,11 +19,14 @@
#ifndef __FTMODULE_H__
#define __FTMODULE_H__
#include <ft2build.h>
#include FT_FREETYPE_H
#include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER
/* module bit flags */
typedef enum FT_Module_Flags_
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment