diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
| commit | 4284aeba874b9168f2228c59639bec8346a56796 (patch) | |
| tree | d51ffb4507e0cae24b0875d8bb6b2c037829a684 /freetype/src/cache/ftcimage.c | |
| parent | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (diff) | |
| parent | 0695dfb71ca6fe132d15a4d0890e8a868183adf9 (diff) | |
| download | vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.gz vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.bz2 vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.zip | |
svn merge ^/branches/released
Diffstat (limited to 'freetype/src/cache/ftcimage.c')
| -rw-r--r-- | freetype/src/cache/ftcimage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/freetype/src/cache/ftcimage.c b/freetype/src/cache/ftcimage.c index 18e1dbc1e..cec01ceb7 100644 --- a/freetype/src/cache/ftcimage.c +++ b/freetype/src/cache/ftcimage.c @@ -103,12 +103,12 @@ } - FT_LOCAL_DEF( FT_ULong ) + FT_LOCAL_DEF( FT_Offset ) ftc_inode_weight( FTC_Node ftcinode, FTC_Cache ftccache ) { FTC_INode inode = (FTC_INode)ftcinode; - FT_ULong size = 0; + FT_Offset size = 0; FT_Glyph glyph = inode->glyph; FT_UNUSED( ftccache ); @@ -151,7 +151,7 @@ #if 0 - FT_LOCAL_DEF( FT_ULong ) + FT_LOCAL_DEF( FT_Offset ) FTC_INode_Weight( FTC_INode inode ) { return ftc_inode_weight( FTC_NODE( inode ), NULL ); |