Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

re-fixed FTC_Manager_Done :-)

Browse Source
VER-2-0-4-PATCH
David Turner 24 years ago
parent 12c6965161
commit bb54f997f9
4 changed files with 17 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      include/freetype/config/ft2build.h
  2. 12
      src/autohint/ahangles.c
  3. 33
      src/autohint/ahangles.h
  4. 4
      src/cache/ftcmanag.c

27
include/freetype/config/ft2build.h
Unescape View File

@ -26,8 +26,8 @@
/* #ifndef __FT_BUILD_UNIX_H__ */
/* #define __FT_BUILD_UNIX_H__ */
/* */
/* #define FT_ROOT freetype2 */
/* #include <FT_ROOT/config/ft2build.h> */
/* #define FT2_ROOT freetype2 */
/* #include <FT2_ROOT/config/ft2build.h> */
/* */
/* #endif // __FT_BUILD_UNIX_H__ */
/* */
@ -99,23 +99,6 @@
#define FT2_INTERNAL_FILE( x ) <FT2_ROOT/internal/x>
/*************************************************************************/
/* */
/* The macro FT2_COMPONENT_FILE is used to include a given FreeType 2 */
/* component source file (be it a header, a C source file, or an */
/* included file). */
/* */
/* Its first argument is the component/module's directory according to */
/* the normal FreeType 2 source directory hierarchy, and the second one */
/* the file name. */
/* */
/* Note that you can also put all library source files in a single */
/* directory and compile them normally by defining the macro */
/* FT_FLAT_COMPILATION. */
/* */
#define FT2_COMPONENT_FILE( d, x ) <FT2_ROOT/d/x>
/*************************************************************************/
/* */
/* The macro FT2_SOURCE_FILE is used to include a given FreeType 2 */
@ -130,10 +113,10 @@
/* directory and compile them normally by defining the macro */
/* FT_FLAT_COMPILATION. */
/* */
#ifdef FT2_FLAT_COMPILATION
#define FT2_SOURCE_FILE( d, x ) <d/x>
#ifdef FT_FLAT_COMPILATION
#define FT_SOURCE_FILE( d, x ) <d/x>
#else
#define FT2_SOURCE_FILE( d, x ) "x"
#define FT_SOURCE_FILE( d, x ) #x
#endif

12
src/autohint/ahangles.c
Unescape View File

@ -19,16 +19,8 @@
/* */
/***************************************************************************/
#ifdef FT_FLAT_COMPILE
#include "ahangles.h"
#else
#include <autohint/ahangles.h>
#endif
#include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahangles.h)
/* the following table has been automatically generated with */

33
src/autohint/ahangles.h
Unescape View File

@ -20,28 +20,14 @@
/***************************************************************************/
#ifndef AHANGLES_H
#define AHANGLES_H
#ifndef __AHANGLES_H__
#define __AHANGLES_H__
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE(autohint,ahtypes.h)
#ifdef FT_FLAT_COMPILE
#include "ahtypes.h"
#else
#include <autohint/ahtypes.h>
#endif
#include <freetype/internal/ftobjs.h>
#ifdef __cplusplus
extern "C" {
#endif
FT_BEGIN_HEADER
/* PI expressed in ah_angles -- we don't really need an important */
/* precision, so 256 should be enough */
@ -62,12 +48,9 @@
AH_Angle ah_angle( FT_Vector* v );
#ifdef __cplusplus
}
#endif
FT_END_HEADER
#endif /* AHANGLES_H */
#endif /* __AHANGLES_H__ */
/* END */

4
src/cache/ftcmanag.c vendored
Unescape View File

@ -265,8 +265,8 @@
Exit:
if ( error && manager )
{
FT_Lru_Done( manager->sizes_lru );
FT_Lru_Done( manager->faces_lru );
FT_Lru_Done( manager->sizes_lru );
FREE( manager );
}
@ -304,7 +304,7 @@
manager->faces_lru = 0;
FT_Lru_Done( manager->sizes_lru );
manager->sizes_lru;
manager->sizes_lru = 0;
FREE( manager );
}

Write Preview
Loading…
Cancel
Save