diff options
| author | Behdad Esfahbod <behdad@google.com> | 2014-08-08 17:55:11 -0400 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-08-19 11:41:37 -0700 |
| commit | b5dc5490f5ac40a661faf6066223a3a978375369 (patch) | |
| tree | 86c9ee0214cac2870a94905e4240732413ed768b /include/internal/ftrfork.h | |
| parent | 0e0d6b5b627150577c9f4486b3ba97f9778799ca (diff) | |
| download | android_external_freetype-b5dc5490f5ac40a661faf6066223a3a978375369.tar.gz android_external_freetype-b5dc5490f5ac40a661faf6066223a3a978375369.tar.bz2 android_external_freetype-b5dc5490f5ac40a661faf6066223a3a978375369.zip | |
Update freetype to e1394d56752cac3bd68ab2358a8e1384ce7b9aaa
Integrated patches from freetype2 git repository, up to hashval
e1394d56752cac3bd68ab2358a8e1384ce7b9aaa, which is post-2.5.3.
Most recent commit message from freetype git:
Minor documentation improvement.
Noteworthy patches included:
Fix Savannah bug #41697, part 2.
Fix Savannah bug #41697, part 1.
RM-154
Bug: 16575323
Change-Id: I4f8f9375afd2540618b3ebf6152d77b743975dce
(cherry picked from commit 391103df1077dca897aef9efa1c80318334c9ade)
Diffstat (limited to 'include/internal/ftrfork.h')
| -rw-r--r-- | include/internal/ftrfork.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/internal/ftrfork.h b/include/internal/ftrfork.h index 6307f2d..d750cbe 100644 --- a/include/internal/ftrfork.h +++ b/include/internal/ftrfork.h @@ -4,7 +4,7 @@ /* */ /* Embedded resource forks accessor (specification). */ /* */ -/* Copyright 2004, 2006, 2007, 2012 by */ +/* Copyright 2004, 2006, 2007, 2012, 2013 by */ /* Masatake YAMATO and Redhat K.K. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -94,7 +94,7 @@ FT_BEGIN_HEADER /* this array is a function in PIC mode, so no ; is needed in END */ #define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \ void \ - FT_Init_ ## name( type* storage ) \ + FT_Init_Table_ ## name( type* storage ) \ { \ type* local = storage; \ \ @@ -224,6 +224,13 @@ FT_BEGIN_HEADER /* tag :: */ /* The resource tag. */ /* */ + /* sort_by_res_id :: */ + /* A Boolean to sort the fragmented resource by their ids. */ + /* The fragmented resources for `POST' resource should be sorted */ + /* to restore Type1 font properly. For `snft' resources, sorting */ + /* may induce a different order of the faces in comparison to that */ + /* by QuickDraw API. */ + /* */ /* <Output> */ /* offsets :: */ /* The stream offsets for the resource data specified by `tag'. */ @@ -246,6 +253,7 @@ FT_BEGIN_HEADER FT_Long map_offset, FT_Long rdata_pos, FT_Long tag, + FT_Bool sort_by_res_id, FT_Long **offsets, FT_Long *count ); |