From 697b3d945721286105e8976817dc9d6be61140de Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 8 Jan 2013 12:40:56 +0100
Subject: Solved type cast errors in debug
---
fontconfig/src/fcfreetype.c | 8 ++++----
fontconfig/src/fcstat.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c
index 9ac2fa901..e88c37770 100644
--- a/fontconfig/src/fcfreetype.c
+++ b/fontconfig/src/fcfreetype.c
@@ -2579,10 +2579,10 @@ addtag(FcChar8 *complex_, FT_ULong tag)
{
FcChar8 tagstring[OTLAYOUT_ID_LEN + 1];
- tagstring[0] = (FcChar8)(tag >> 24),
- tagstring[1] = (FcChar8)(tag >> 16),
- tagstring[2] = (FcChar8)(tag >> 8),
- tagstring[3] = (FcChar8)(tag);
+ tagstring[0] = (FcChar8)((tag >> 24)&0xff),
+ tagstring[1] = (FcChar8)((tag >> 16)&0xff),
+ tagstring[2] = (FcChar8)((tag >> 8)&0xff),
+ tagstring[3] = (FcChar8)((tag)&0xff);
tagstring[4] = '\0';
/* skip tags which aren't alphabetic, under the assumption that
diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c
index 390f45c37..9e84aa490 100644
--- a/fontconfig/src/fcstat.c
+++ b/fontconfig/src/fcstat.c
@@ -93,7 +93,7 @@ FcStat (const FcChar8 *file, struct stat *statb)
return -1;
rc = GetLongPathName (full_path_name, full_path_name, sizeof (full_path_name));
- statb->st_ino = FcStringHash ((const FcChar8 *) full_path_name);
+ statb->st_ino = FcStringHash ((const FcChar8 *) full_path_name)&0xffff;
statb->st_mode = _S_IREAD | _S_IWRITE;
statb->st_mode |= (statb->st_mode >> 3) | (statb->st_mode >> 6);
--
cgit v1.2.3