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/base/ftoutln.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/base/ftoutln.c')
| -rw-r--r-- | src/base/ftoutln.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 5bb6ef3..356b156 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -305,8 +305,8 @@ *anoutline = null_outline; if ( FT_NEW_ARRAY( anoutline->points, numPoints ) || - FT_NEW_ARRAY( anoutline->tags, numPoints ) || - FT_NEW_ARRAY( anoutline->contours, numContours ) ) + FT_NEW_ARRAY( anoutline->tags, numPoints ) || + FT_NEW_ARRAY( anoutline->contours, numContours ) ) goto Fail; anoutline->n_points = (FT_UShort)numPoints; @@ -990,7 +990,8 @@ int i; FT_Pos ray_y[3]; - FT_Orientation result[3]; + FT_Orientation result[3] = + { FT_ORIENTATION_NONE, FT_ORIENTATION_NONE, FT_ORIENTATION_NONE }; if ( !outline || outline->n_points <= 0 ) |