diff options
author | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-15 15:40:02 +0000 |
---|---|---|
committer | Jonathan Kew <jfkthame@googlemail.com> | 2008-02-15 15:40:02 +0000 |
commit | 2445b3193ddfa82efd2a95695694be74260e4e7c (patch) | |
tree | d0a1e783a715fa3e4f6a951b2824b680f1de7bd2 /Build/source/libs/graphite-engine/src | |
parent | 21854aa6efbf4fb1013d04ec22340388af752dc7 (diff) |
graphite portability issues, from xetex svn rev.573
git-svn-id: svn://tug.org/texlive/trunk@6638 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite-engine/src')
6 files changed, 31 insertions, 3 deletions
diff --git a/Build/source/libs/graphite-engine/src/font/TtfTypes.h b/Build/source/libs/graphite-engine/src/font/TtfTypes.h index 4797cd2aa4d..da8d90f1f26 100644 --- a/Build/source/libs/graphite-engine/src/font/TtfTypes.h +++ b/Build/source/libs/graphite-engine/src/font/TtfTypes.h @@ -55,7 +55,7 @@ enum //********************************************************************************************** namespace Sfnt { -#pragma pack(push, 1) // We need this or the structure members aren't alligned +#pragma pack(1) // We need this or the structure members aren't alligned // correctly. Fortunately this form of pragma is supposed // to be recongnised by VS C++ too (at least according to // MSDN). @@ -382,7 +382,7 @@ namespace Sfnt }; }; -#pragma pack(pop) +#pragma pack() } // end of namespace Sfnt } // end of namespace TtfUtil diff --git a/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp b/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp index 559f72fb887..7ada7e4a413 100644 --- a/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp +++ b/Build/source/libs/graphite-engine/src/painter/SegmentPainter.cpp @@ -29,6 +29,13 @@ Description: #undef THIS_FILE DEFINE_THIS_FILE +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + //:>******************************************************************************************** //:> Forward declarations //:>******************************************************************************************** diff --git a/Build/source/libs/graphite-engine/src/segment/GrCharStream.h b/Build/source/libs/graphite-engine/src/segment/GrCharStream.h index fa9d8b40785..bb91cf54eba 100644 --- a/Build/source/libs/graphite-engine/src/segment/GrCharStream.h +++ b/Build/source/libs/graphite-engine/src/segment/GrCharStream.h @@ -163,7 +163,7 @@ protected: kzByteMask = 0x3F, kzByteMark = 0x80, kzUtf8ByteShift = 6, - kzUnicodeMax = 0x7FFFFFFF, + kzUnicodeMax = 0x7FFFFFFF }; enum diff --git a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp index cc125a3d9b3..a8e0d4e8348 100644 --- a/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp +++ b/Build/source/libs/graphite-engine/src/segment/GrTableManager.cpp @@ -28,6 +28,13 @@ DEFINE_THIS_FILE #include <math.h> #endif +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + //:>******************************************************************************************** //:> Forward declarations //:>******************************************************************************************** diff --git a/Build/source/libs/graphite-engine/src/segment/Segment.cpp b/Build/source/libs/graphite-engine/src/segment/Segment.cpp index db8f2bc8849..8a82bbf9aa7 100644 --- a/Build/source/libs/graphite-engine/src/segment/Segment.cpp +++ b/Build/source/libs/graphite-engine/src/segment/Segment.cpp @@ -26,6 +26,13 @@ Description: #include <stdlib.h> #endif +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + #undef THIS_FILE DEFINE_THIS_FILE diff --git a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp index ee528110103..72761c33c6b 100644 --- a/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp +++ b/Build/source/libs/graphite-engine/src/segment/TransductionLog.cpp @@ -26,6 +26,13 @@ Description: #undef THIS_FILE DEFINE_THIS_FILE +#ifndef HAVE_FABSF +static float fabsf(float x) +{ + return (x < 0.0f) ? -x : x; +} +#endif + //:End Ignore //:>******************************************************************************************** |