diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-12 12:05:01 +0200 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-05-13 01:09:16 +0000 |
commit | af6c52522b1afc56c5acf30253aaa89ee9c99934 (patch) | |
tree | 54094056874999604c628ac67bed057a00620269 /src/3rdparty | |
parent | ce9ad30c78fe0c9ada7cde579f4f9945821f8e5f (diff) |
Fix MSVC 64 bit compiler warnings in 3rdparty code
Make casts from size_t to int explicit to avoid warnings like
warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data
Change-Id: Ib69c25519dadf8732b0c08412cc97887df00a2d4
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 4 | ||||
-rw-r--r-- | src/3rdparty/md4/md4.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c index 7438d5994c..2d4627e4f7 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c @@ -241,7 +241,7 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item) int lgn = 0; HB_Bool haveSaraAm = false; - cell_length = th_next_cell ((const unsigned char *)cstr + i, len - i, &tis_cell, true); /* !item->fixedPitch); */ + cell_length = (int)(th_next_cell ((const unsigned char *)cstr + i, len - i, &tis_cell, true)); /* !item->fixedPitch); */ haveSaraAm = (cstr[i + cell_length - 1] == (char)0xd3); /* set shaper item's log_clusters */ @@ -432,7 +432,7 @@ static void HB_ThaiAssignAttributes(const HB_UChar16 *string, hb_uint32 len, HB_ /* manage grapheme boundaries */ i = 0; while (i < len) { - cell_length = th_next_cell((const unsigned char *)cstr + i, len - i, &tis_cell, true); + cell_length = (hb_uint32)(th_next_cell((const unsigned char *)cstr + i, len - i, &tis_cell, true)); attributes[i].graphemeBoundary = true; for (j = 1; j < cell_length; j++) diff --git a/src/3rdparty/md4/md4.cpp b/src/3rdparty/md4/md4.cpp index 94ac6adf58..ec74958d69 100644 --- a/src/3rdparty/md4/md4.cpp +++ b/src/3rdparty/md4/md4.cpp @@ -180,7 +180,7 @@ static void md4_update(struct md4_context *ctx, const unsigned char *data, size_ saved_lo = ctx->lo; if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo) ctx->hi++; - ctx->hi += size >> 29; + ctx->hi += (quint32)(size >> 29); used = saved_lo & 0x3f; |