diff options
| author | Nick Kralevich <nnk@google.com> | 2010-09-16 11:32:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:32:17 -0700 |
| commit | cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b (patch) | |
| tree | 2b4c5412391bf31f6a54b237ea83bfde05ec3802 /src/psnames/pspic.c | |
| parent | f2873c598230898219f9481ffb43edc5e4d3f806 (diff) | |
| parent | aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c (diff) | |
| download | android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.tar.gz android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.tar.bz2 android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.zip | |
am aacb8e13: upgrade freetype to 2.4.2.
Merge commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c'
* commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c':
upgrade freetype to 2.4.2.
Diffstat (limited to 'src/psnames/pspic.c')
| -rw-r--r-- | src/psnames/pspic.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/psnames/pspic.c b/src/psnames/pspic.c index ed7dadd..b9075d5 100644 --- a/src/psnames/pspic.c +++ b/src/psnames/pspic.c @@ -4,7 +4,7 @@ /* */ /* The FreeType position independent code services for psnames module. */ /* */ -/* Copyright 2009 by */ +/* Copyright 2009, 2010 by */ /* Oran Agra and Mickey Gabel. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -44,13 +44,15 @@ } } + FT_Error - psnames_module_class_pic_init( FT_Library library ) + psnames_module_class_pic_init( FT_Library library ) { - FT_PIC_Container* pic_container = &library->pic_container; - FT_Error error = FT_Err_Ok; - PSModulePIC* container; - FT_Memory memory = library->memory; + FT_PIC_Container* pic_container = &library->pic_container; + FT_Error error = PSnames_Err_Ok; + PSModulePIC* container; + FT_Memory memory = library->memory; + /* allocate pointer, clear and set global container pointer */ if ( FT_ALLOC ( container, sizeof ( *container ) ) ) |