diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-19 17:34:42 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 13:42:29 +0000 |
commit | 2eaf0cf8fd6e7c290497fedb08134a89e7b49b1d (patch) | |
tree | 0a4f7bf528e87d0b0a71ce7fccf702b87f4cdec1 /src/3rdparty/freetype/src/type1/t1objs.h | |
parent | 77c518a50334d4dcf2476a4f39edc1e3990c7f0b (diff) |
Update bundled FreeType to 2.5.5
Removed everything, imported with help of import_from_tarball.sh script,
and then added a pre-generated builds/unix/ftconfig.h
Task-number: QTBUG-44648
Change-Id: Iea948e41f7761f1580382b3763d04c7a61383382
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/src/type1/t1objs.h')
-rw-r--r-- | src/3rdparty/freetype/src/type1/t1objs.h | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/3rdparty/freetype/src/type1/t1objs.h b/src/3rdparty/freetype/src/type1/t1objs.h index e5e90293d7..54ccbb996a 100644 --- a/src/3rdparty/freetype/src/type1/t1objs.h +++ b/src/3rdparty/freetype/src/type1/t1objs.h @@ -4,7 +4,7 @@ /* */ /* Type 1 objects manager (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2006 by */ +/* Copyright 1996-2001, 2002, 2006, 2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -37,17 +37,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* <Type> */ - /* T1_Driver */ - /* */ - /* <Description> */ - /* A handle to a Type 1 driver object. */ - /* */ - typedef struct T1_DriverRec_ *T1_Driver; - - - /*************************************************************************/ - /* */ - /* <Type> */ /* T1_Size */ /* */ /* <Description> */ @@ -106,14 +95,14 @@ FT_BEGIN_HEADER FT_LOCAL( void ) - T1_Size_Done( T1_Size size ); + T1_Size_Done( FT_Size size ); FT_LOCAL( FT_Error ) - T1_Size_Request( T1_Size size, + T1_Size_Request( FT_Size size, FT_Size_Request req ); FT_LOCAL( FT_Error ) - T1_Size_Init( T1_Size size ); + T1_Size_Init( FT_Size size ); /*************************************************************************/ @@ -142,25 +131,25 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) T1_Face_Init( FT_Stream stream, - T1_Face face, + FT_Face face, FT_Int face_index, FT_Int num_params, FT_Parameter* params ); FT_LOCAL( void ) - T1_Face_Done( T1_Face face ); + T1_Face_Done( FT_Face face ); FT_LOCAL( FT_Error ) - T1_GlyphSlot_Init( T1_GlyphSlot slot ); + T1_GlyphSlot_Init( FT_GlyphSlot slot ); FT_LOCAL( void ) - T1_GlyphSlot_Done( T1_GlyphSlot slot ); + T1_GlyphSlot_Done( FT_GlyphSlot slot ); FT_LOCAL( FT_Error ) - T1_Driver_Init( T1_Driver driver ); + T1_Driver_Init( FT_Module driver ); FT_LOCAL( void ) - T1_Driver_Done( T1_Driver driver ); + T1_Driver_Done( FT_Module driver ); FT_END_HEADER |