diff options
author | axis <qt-info@nokia.com> | 2009-06-29 10:55:00 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-06-29 10:55:00 (GMT) |
commit | 897c48989aa314116aa1604f8f5d29514a40774d (patch) | |
tree | 297b6efdf1c7e26e3391aae8d8e4391cc117fae9 /src/3rdparty | |
parent | 9875973c21660afbe19430d9a71fe7c22a8feb4c (diff) | |
download | Qt-897c48989aa314116aa1604f8f5d29514a40774d.zip Qt-897c48989aa314116aa1604f8f5d29514a40774d.tar.gz Qt-897c48989aa314116aa1604f8f5d29514a40774d.tar.bz2 |
Remove some warnings in harfbuzz component.
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-gpos.c | 2 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-impl.c | 4 | ||||
-rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-stream.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c index 1ac3779..c932ec2 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c @@ -2723,7 +2723,7 @@ static HB_Error Load_Mark2Array( HB_Mark2Array* m2a, { HB_Error error; - HB_UShort k, m, n, count; + HB_UShort m, n, count; HB_UInt cur_offset, new_offset, base_offset; HB_Mark2Record *m2r; diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c index 9056a55..ddbf36b 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c @@ -33,7 +33,7 @@ HB_INTERNAL HB_Pointer _hb_alloc(size_t size, HB_Error *perror ) { - HB_Error error = 0; + HB_Error error = (HB_Error)0; HB_Pointer block = NULL; if ( size > 0 ) @@ -54,7 +54,7 @@ _hb_realloc(HB_Pointer block, HB_Error *perror ) { HB_Pointer block2 = NULL; - HB_Error error = 0; + HB_Error error = (HB_Error)0; block2 = realloc( block, new_size ); if ( block2 == NULL && new_size != 0 ) diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c index 3dcee82..2d9638f 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c @@ -70,7 +70,7 @@ HB_INTERNAL HB_Error _hb_stream_seek( HB_Stream stream, HB_UInt pos ) { - HB_Error error = 0; + HB_Error error = (HB_Error)0; stream->pos = pos; if (pos > stream->size) |