diff options
Diffstat (limited to 'other')
| -rw-r--r-- | other/freetype/freetype.lua | 6 | ||||
| -rw-r--r-- | other/freetype/include/freetype/config/ftconfig.h | 2 | ||||
| -rw-r--r-- | other/freetype/include/freetype/freetype.h | 36 | ||||
| -rw-r--r-- | other/freetype/include/freetype/ftcache.h | 7 | ||||
| -rw-r--r-- | other/freetype/include/freetype/ftimage.h | 12 | ||||
| -rw-r--r-- | other/freetype/include/freetype/ftlcdfil.h | 2 | ||||
| -rw-r--r-- | other/freetype/include/freetype/ftmodapi.h | 35 | ||||
| -rw-r--r-- | other/freetype/include/freetype/internal/ftobjs.h | 31 | ||||
| -rw-r--r-- | other/freetype/lib/freetype243MT.lib (renamed from other/freetype/lib/freetype241MT.lib) | bin | 777960 -> 778610 bytes | |||
| -rw-r--r-- | other/freetype/lib/freetype243MT_D.lib | bin | 0 -> 2429322 bytes |
10 files changed, 123 insertions, 8 deletions
diff --git a/other/freetype/freetype.lua b/other/freetype/freetype.lua index f1abff46..7c7e8570 100644 --- a/other/freetype/freetype.lua +++ b/other/freetype/freetype.lua @@ -28,7 +28,11 @@ FreeType = { settings.link.flags:Add("`freetype-config --libs`") elseif option.use_win32lib == true then - settings.link.libs:Add(FreeType.basepath .. "/lib/freetype241MT") + if settings.debug > 0 then + settings.link.libs:Add(FreeType.basepath .. "/lib/freetype243MT_D") + else + settings.link.libs:Add(FreeType.basepath .. "/lib/freetype243MT") + end end end diff --git a/other/freetype/include/freetype/config/ftconfig.h b/other/freetype/include/freetype/config/ftconfig.h index 43d587e0..cbe30f26 100644 --- a/other/freetype/include/freetype/config/ftconfig.h +++ b/other/freetype/include/freetype/config/ftconfig.h @@ -363,7 +363,7 @@ FT_BEGIN_HEADER #endif /* __arm__ && !__thumb__ && !( __CC_ARM || __ARMCC__ ) */ -#if defined( i386 ) +#if defined( __i386__ ) #define FT_MULFIX_ASSEMBLER FT_MulFix_i386 /* documentation is in freetype.h */ diff --git a/other/freetype/include/freetype/freetype.h b/other/freetype/include/freetype/freetype.h index e2ab7743..3b303325 100644 --- a/other/freetype/include/freetype/freetype.h +++ b/other/freetype/include/freetype/freetype.h @@ -1952,6 +1952,9 @@ FT_BEGIN_HEADER /* Each new face object created with this function also owns a */ /* default @FT_Size object, accessible as `face->size'. */ /* */ + /* See the discussion of reference counters in the description of */ + /* @FT_Reference_Face. */ + /* */ FT_EXPORT( FT_Error ) FT_Open_Face( FT_Library library, const FT_Open_Args* args, @@ -2019,6 +2022,33 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Function> */ + /* FT_Reference_Face */ + /* */ + /* <Description> */ + /* A counter gets initialized to~1 at the time an @FT_Face structure */ + /* is created. This function increments the counter. @FT_Done_Face */ + /* then only destroys a face if the counter is~1, otherwise it simply */ + /* decrements the counter. */ + /* */ + /* This function helps in managing life-cycles of structures which */ + /* reference @FT_Face objects. */ + /* */ + /* <Input> */ + /* face :: A handle to a target face object. */ + /* */ + /* <Return> */ + /* FreeType error code. 0~means success. */ + /* */ + /* <Since> */ + /* 2.4.2 */ + /* */ + FT_EXPORT( FT_Error ) + FT_Reference_Face( FT_Face face ); + + + /*************************************************************************/ + /* */ + /* <Function> */ /* FT_Done_Face */ /* */ /* <Description> */ @@ -2031,6 +2061,10 @@ FT_BEGIN_HEADER /* <Return> */ /* FreeType error code. 0~means success. */ /* */ + /* <Note> */ + /* See the discussion of reference counters in the description of */ + /* @FT_Reference_Face. */ + /* */ FT_EXPORT( FT_Error ) FT_Done_Face( FT_Face face ); @@ -3774,7 +3808,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 4 -#define FREETYPE_PATCH 1 +#define FREETYPE_PATCH 3 /*************************************************************************/ diff --git a/other/freetype/include/freetype/ftcache.h b/other/freetype/include/freetype/ftcache.h index a9e1237b..fe8664d0 100644 --- a/other/freetype/include/freetype/ftcache.h +++ b/other/freetype/include/freetype/ftcache.h @@ -56,9 +56,12 @@ FT_BEGIN_HEADER * interpret them in any way. * * Second, the cache calls, only when needed, a client-provided function - * to convert a @FTC_FaceID into a new @FT_Face object. The latter is + * to convert an @FTC_FaceID into a new @FT_Face object. The latter is * then completely managed by the cache, including its termination - * through @FT_Done_Face. + * through @FT_Done_Face. To monitor termination of face objects, the + * finalizer callback in the `generic' field of the @FT_Face object can + * be used, which might also be used to store the @FTC_FaceID of the + * face. * * Clients are free to map face IDs to anything else. The most simple * usage is to associate them to a (pathname,face_index) pair that is diff --git a/other/freetype/include/freetype/ftimage.h b/other/freetype/include/freetype/ftimage.h index 0272e92d..04b5e04f 100644 --- a/other/freetype/include/freetype/ftimage.h +++ b/other/freetype/include/freetype/ftimage.h @@ -268,9 +268,21 @@ FT_BEGIN_HEADER /* flow. In all cases, the pitch is an offset to add */ /* to a bitmap pointer in order to go down one row. */ /* */ + /* Note that `padding' means the alignment of a */ + /* bitmap to a byte border, and FreeType functions */ + /* normally align to the smallest possible integer */ + /* value. */ + /* */ /* For the B/W rasterizer, `pitch' is always an even */ /* number. */ /* */ + /* To change the pitch of a bitmap (say, to make it a */ + /* multiple of 4), use @FT_Bitmap_Convert. */ + /* Alternatively, you might use callback functions to */ + /* directly render to the application's surface; see */ + /* the file `example2.cpp' in the tutorial for a */ + /* demonstration. */ + /* */ /* buffer :: A typeless pointer to the bitmap buffer. This */ /* value should be aligned on 32-bit boundaries in */ /* most cases. */ diff --git a/other/freetype/include/freetype/ftlcdfil.h b/other/freetype/include/freetype/ftlcdfil.h index e7f59271..0b55ebee 100644 --- a/other/freetype/include/freetype/ftlcdfil.h +++ b/other/freetype/include/freetype/ftlcdfil.h @@ -58,7 +58,7 @@ FT_BEGIN_HEADER /**************************************************************************** * - * @func: + * @enum: * FT_LcdFilter * * @description: diff --git a/other/freetype/include/freetype/ftmodapi.h b/other/freetype/include/freetype/ftmodapi.h index 17868b2f..8f2e0179 100644 --- a/other/freetype/include/freetype/ftmodapi.h +++ b/other/freetype/include/freetype/ftmodapi.h @@ -252,6 +252,33 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Function> */ + /* FT_Reference_Library */ + /* */ + /* <Description> */ + /* A counter gets initialized to~1 at the time an @FT_Library */ + /* structure is created. This function increments the counter. */ + /* @FT_Done_Library then only destroys a library if the counter is~1, */ + /* otherwise it simply decrements the counter. */ + /* */ + /* This function helps in managing life-cycles of structures which */ + /* reference @FT_Library objects. */ + /* */ + /* <Input> */ + /* library :: A handle to a target library object. */ + /* */ + /* <Return> */ + /* FreeType error code. 0~means success. */ + /* */ + /* <Since> */ + /* 2.4.2 */ + /* */ + FT_EXPORT( FT_Error ) + FT_Reference_Library( FT_Library library ); + + + /*************************************************************************/ + /* */ + /* <Function> */ /* FT_New_Library */ /* */ /* <Description> */ @@ -275,6 +302,10 @@ FT_BEGIN_HEADER /* <Return> */ /* FreeType error code. 0~means success. */ /* */ + /* <Note> */ + /* See the discussion of reference counters in the description of */ + /* @FT_Reference_Library. */ + /* */ FT_EXPORT( FT_Error ) FT_New_Library( FT_Memory memory, FT_Library *alibrary ); @@ -295,6 +326,10 @@ FT_BEGIN_HEADER /* <Return> */ /* FreeType error code. 0~means success. */ /* */ + /* <Note> */ + /* See the discussion of reference counters in the description of */ + /* @FT_Reference_Library. */ + /* */ FT_EXPORT( FT_Error ) FT_Done_Library( FT_Library library ); diff --git a/other/freetype/include/freetype/internal/ftobjs.h b/other/freetype/include/freetype/internal/ftobjs.h index 574cf582..670eb78a 100644 --- a/other/freetype/include/freetype/internal/ftobjs.h +++ b/other/freetype/include/freetype/internal/ftobjs.h @@ -4,7 +4,7 @@ /* */ /* The FreeType private base classes (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -311,6 +311,12 @@ FT_BEGIN_HEADER /* in the case when the unpatented hinter is compiled within the */ /* library. */ /* */ + /* refcount :: */ + /* A counter initialized to~1 at the time an @FT_Face structure is */ + /* created. @FT_Reference_Face increments this counter, and */ + /* @FT_Done_Face only destroys a face if the counter is~1, */ + /* otherwise it simply decrements it. */ + /* */ typedef struct FT_Face_InternalRec_ { #ifdef FT_CONFIG_OPTION_OLD_INTERNALS @@ -328,6 +334,7 @@ FT_BEGIN_HEADER #endif FT_Bool ignore_unpatented_hinter; + FT_UInt refcount; } FT_Face_InternalRec; @@ -805,10 +812,28 @@ FT_BEGIN_HEADER /* */ /* debug_hooks :: XXX */ /* */ + /* lcd_filter :: If subpixel rendering is activated, the */ + /* selected LCD filter mode. */ + /* */ + /* lcd_extra :: If subpixel rendering is activated, the number */ + /* of extra pixels needed for the LCD filter. */ + /* */ + /* lcd_weights :: If subpixel rendering is activated, the LCD */ + /* filter weights, if any. */ + /* */ + /* lcd_filter_func :: If subpixel rendering is activated, the LCD */ + /* filtering callback function. */ + /* */ /* pic_container :: Contains global structs and tables, instead */ /* of defining them globallly. */ /* */ - + /* refcount :: A counter initialized to~1 at the time an */ + /* @FT_Library structure is created. */ + /* @FT_Reference_Library increments this counter, */ + /* and @FT_Done_Library only destroys a library */ + /* if the counter is~1, otherwise it simply */ + /* decrements it. */ + /* */ typedef struct FT_LibraryRec_ { FT_Memory memory; /* library's memory manager */ @@ -843,6 +868,8 @@ FT_BEGIN_HEADER FT_PIC_Container pic_container; #endif + FT_UInt refcount; + } FT_LibraryRec; diff --git a/other/freetype/lib/freetype241MT.lib b/other/freetype/lib/freetype243MT.lib index c05a30cb..1740877b 100644 --- a/other/freetype/lib/freetype241MT.lib +++ b/other/freetype/lib/freetype243MT.lib Binary files differdiff --git a/other/freetype/lib/freetype243MT_D.lib b/other/freetype/lib/freetype243MT_D.lib new file mode 100644 index 00000000..be943dc2 --- /dev/null +++ b/other/freetype/lib/freetype243MT_D.lib Binary files differ |