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 /include/freetype/ftsystem.h | |
| 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 'include/freetype/ftsystem.h')
| -rw-r--r-- | include/freetype/ftsystem.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h index a95b2c7..e07460c 100644 --- a/include/freetype/ftsystem.h +++ b/include/freetype/ftsystem.h @@ -4,7 +4,7 @@ /* */ /* FreeType low-level system interface definition (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2005 by */ +/* Copyright 1996-2001, 2002, 2005, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -240,7 +240,8 @@ FT_BEGIN_HEADER * * @note: * This function might be called to perform a seek or skip operation - * with a `count' of~0. + * with a `count' of~0. A non-zero return value then indicates an + * error. * */ typedef unsigned long @@ -301,7 +302,7 @@ FT_BEGIN_HEADER * The stream's input function. * * close :: - * The stream;s close function. + * The stream's close function. * * memory :: * The memory manager to use to preload frames. This is set |