From ad153fd558515a39d7b0db1b06d304873f362c2e Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 19 Feb 2013 11:38:02 +0000 Subject: Fix some warning on Mac git-svn-id: svn://tug.org/texlive/trunk@29163 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp | 2 +- Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h | 2 +- Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp index 4920d321d9b..c55ba2cf008 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp +++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp @@ -418,7 +418,7 @@ getGraphiteFeatureSettingLabel(XeTeXLayoutEngine engine, uint32_t featureID, uin } bool -findGraphiteFeature(XeTeXLayoutEngine engine, const char* s, const char* e, int* f, int* v) +findGraphiteFeature(XeTeXLayoutEngine engine, const char* s, const char* e, hb_tag_t* f, int* v) /* s...e is a "feature[=setting]" string; look for this in the font */ { *f = 0; diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h index b2a4b0f0fc2..a3e3ac2edae 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h +++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.h @@ -152,7 +152,7 @@ bool usingOpenType(XeTeXLayoutEngine engine); bool usingGraphite(XeTeXLayoutEngine engine); bool isOpenTypeMathFont(XeTeXLayoutEngine engine); -bool findGraphiteFeature(XeTeXLayoutEngine engine, const char* s, const char* e, int* f, int* v); +bool findGraphiteFeature(XeTeXLayoutEngine engine, const char* s, const char* e, hb_tag_t* f, int* v); uint32_t countGraphiteFeatures(XeTeXLayoutEngine engine); uint32_t getGraphiteFeatureCode(XeTeXLayoutEngine engine, uint32_t index); diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index f20b5db3ba2..56b00d66fd0 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -293,7 +293,7 @@ apply_normalization(uint32_t* buf, int len, int norm) static TECkit_Converter normalizers[2] = { NULL, NULL }; TECkit_Status status; - uint32_t inUsed, outUsed; + UInt32 inUsed, outUsed; TECkit_Converter *normPtr = &normalizers[norm - 1]; if (*normPtr == NULL) { status = TECkit_CreateConverter(NULL, 0, 1, @@ -305,7 +305,7 @@ apply_normalization(uint32_t* buf, int len, int norm) } } - status = TECkit_ConvertBuffer(*normPtr, (Byte*)buf, len * sizeof(uint32_t), &inUsed, + status = TECkit_ConvertBuffer(*normPtr, (Byte*)buf, len * sizeof(UInt32), &inUsed, (Byte*)&buffer[first], sizeof(*buffer) * (bufsize - first), &outUsed, 1); if (status != kStatus_NoError) buffer_overflow(); @@ -674,7 +674,7 @@ applytfmfontmapping(void* cnv, int c) { UniChar in = c; Byte out[2]; - uint32_t inUsed, outUsed; + UInt32 inUsed, outUsed; TECkit_Status status = TECkit_ConvertBuffer((TECkit_Converter)cnv, (const Byte*)&in, sizeof(in), &inUsed, out, sizeof(out), &outUsed, 1); if (outUsed < 1) @@ -854,7 +854,7 @@ readCommonFeatures(const char* feat, const char* end, float* extend, float* slan } static bool -readFeatureNumber(const char* s, const char* e, int* f, int* v) +readFeatureNumber(const char* s, const char* e, hb_tag_t* f, int* v) /* s...e is a "id[=setting]" string; */ { *f = 0; @@ -1754,9 +1754,9 @@ int applymapping(void* pCnv, const uint16_t* txtPtr, int txtLen) { TECkit_Converter cnv = (TECkit_Converter)pCnv; - uint32_t inUsed, outUsed; + UInt32 inUsed, outUsed; TECkit_Status status; - static uint32_t outLength = 0; + static UInt32 outLength = 0; /* allocate outBuffer if not big enough */ if (outLength < txtLen * sizeof(UniChar) + 32) { -- cgit v1.2.3