diff options
| author | Victoria Lease <violets@google.com> | 2013-12-12 09:12:18 -0800 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-08-19 11:41:16 -0700 |
| commit | 0e0d6b5b627150577c9f4486b3ba97f9778799ca (patch) | |
| tree | baa7eea792c50b86250831c67a9f2a6eb5be6a91 /src/autofit/afpic.c | |
| parent | 5b18c5874f85aa819ddef822b95a66ca070421dc (diff) | |
| download | android_external_freetype-0e0d6b5b627150577c9f4486b3ba97f9778799ca.tar.gz android_external_freetype-0e0d6b5b627150577c9f4486b3ba97f9778799ca.tar.bz2 android_external_freetype-0e0d6b5b627150577c9f4486b3ba97f9778799ca.zip | |
Update freetype to 8bb09b0fe4d9747bcf452a777cabed7d7ef435e2
Integrated patches from freetype2 git repository, up to hashval
8bb09b0fe4d9747bcf452a777cabed7d7ef435e2, which is post-2.5.2.
Most recent commit message from freetype git:
[truetype] Simplify logic of rendering modes.
Noteworthy patches included:
[sfnt] Fix handling of embedded bitmap strikes.
[truetype] Improve handling of buggy embedded bitmap strikes.
Add FT_FACE_FLAG_COLOR and FT_HAS_COLOR.
RM-154
Change-Id: I4a22d96c9443c7a587475ca0a9c684843e144b18
(cherry picked from commit 186452fd35238e2cd86e4e1494eaee211d7e4ccd)
Diffstat (limited to 'src/autofit/afpic.c')
| -rw-r--r-- | src/autofit/afpic.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/autofit/afpic.c b/src/autofit/afpic.c index 45e1448..92d696d 100644 --- a/src/autofit/afpic.c +++ b/src/autofit/afpic.c @@ -43,13 +43,10 @@ /* forward declaration of PIC init functions from script classes */ -#include "aflatin.h" -#ifdef FT_OPTION_AUTOFIT2 -#include "aflatin2.h" -#endif -#include "afcjk.h" -#include "afdummy.h" -#include "afindic.h" +#undef WRITING_SYSTEM +#define WRITING_SYSTEM( ws, WS ) /* empty */ + +#include "afwrtsys.h" void @@ -100,27 +97,31 @@ FT_Init_Class_af_service_properties( &container->af_service_properties ); - for ( ss = 0 ; ss < AF_SCRIPT_CLASSES_REC_COUNT ; ss++ ) - { + for ( ss = 0; ss < AF_WRITING_SYSTEM_MAX - 1; ss++ ) + container->af_writing_system_classes[ss] = + &container->af_writing_system_classes_rec[ss]; + container->af_writing_system_classes[AF_WRITING_SYSTEM_MAX - 1] = NULL; + + for ( ss = 0; ss < AF_SCRIPT_MAX - 1; ss++ ) container->af_script_classes[ss] = &container->af_script_classes_rec[ss]; - } - container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL; + container->af_script_classes[AF_SCRIPT_MAX - 1] = NULL; + +#undef WRITING_SYSTEM +#define WRITING_SYSTEM( ws, WS ) \ + FT_Init_Class_af_ ## ws ## _writing_system_class( \ + &container->af_writing_system_classes_rec[ss++] ); + + ss = 0; +#include "afwrtsys.h" + +#undef SCRIPT +#define SCRIPT( s, S, d ) \ + FT_Init_Class_af_ ## s ## _script_class( \ + &container->af_script_classes_rec[ss++] ); - /* add call to initialization function when you add new scripts */ ss = 0; - FT_Init_Class_af_dummy_script_class( - &container->af_script_classes_rec[ss++] ); -#ifdef FT_OPTION_AUTOFIT2 - FT_Init_Class_af_latin2_script_class( - &container->af_script_classes_rec[ss++] ); -#endif - FT_Init_Class_af_latin_script_class( - &container->af_script_classes_rec[ss++] ); - FT_Init_Class_af_cjk_script_class( - &container->af_script_classes_rec[ss++] ); - FT_Init_Class_af_indic_script_class( - &container->af_script_classes_rec[ss++] ); +#include "afscript.h" FT_Init_Class_af_autofitter_interface( library, &container->af_autofitter_interface ); |