This repository has been archived by the owner on Oct 18, 2023. It is now read-only.
forked from microsoft/Font-Validator
-
Notifications
You must be signed in to change notification settings - Fork 12
/
freetype-win64-2.8.patch
100 lines (87 loc) · 3.53 KB
/
freetype-win64-2.8.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
diff -pNaur include_old/ftimage.h include/ftimage.h
--- include_old/freetype/ftimage.h Sat Mar 7 18:56:10 2015
+++ include/freetype/ftimage.h Sat Mar 7 22:12:11 2015
@@ -55,7 +55,11 @@ FT_BEGIN_HEADER
/* on the context, these can represent distances in integer font */
/* units, or 16.16, or 26.6 fixed-point pixel coordinates. */
/* */
- typedef signed long FT_Pos;
+#ifdef _WIN64
+ typedef signed __int64 FT_Pos;
+#else
+ typedef signed long FT_Pos;
+#endif
/*************************************************************************/
diff -pNaur include_old/ftsystem.h include/ftsystem.h
--- include_old/freetype/ftsystem.h 2015-03-11 06:47:11.000000000 +0100
+++ include/freetype/ftsystem.h 2017-05-07 20:17:21.707763600 +0200
@@ -330,8 +330,13 @@ FT_BEGIN_HEADER
typedef struct FT_StreamRec_
{
unsigned char* base;
+#ifdef _WIN64
+ unsigned __int64 size;
+ unsigned __int64 pos;
+#else
unsigned long size;
unsigned long pos;
+#endif
FT_StreamDesc descriptor;
FT_StreamDesc pathname;
diff -pNaur include_old/fttypes.h include/fttypes.h
--- include_old/freetype/fttypes.h Sat Mar 7 21:46:14 2015
+++ include/freetype/fttypes.h Sat Mar 7 21:52:41 2015
@@ -239,7 +239,11 @@ FT_BEGIN_HEADER
/* <Description> */
/* A typedef for signed long. */
/* */
- typedef signed long FT_Long;
+#ifdef _WIN64
+ typedef signed __int64 FT_Long;
+#else
+ typedef signed long FT_Long;
+#endif
/*************************************************************************/
@@ -250,7 +254,11 @@ FT_BEGIN_HEADER
/* <Description> */
/* A typedef for unsigned long. */
/* */
- typedef unsigned long FT_ULong;
+#ifdef _WIN64
+ typedef unsigned __int64 FT_ULong;
+#else
+ typedef unsigned long FT_ULong;
+#endif
/*************************************************************************/
@@ -273,7 +281,11 @@ FT_BEGIN_HEADER
/* A signed 26.6 fixed-point type used for vectorial pixel */
/* coordinates. */
/* */
- typedef signed long FT_F26Dot6;
+#ifdef _WIN64
+ typedef signed __int64 FT_F26Dot6;
+#else
+ typedef signed long FT_F26Dot6;
+#endif
/*************************************************************************/
@@ -285,7 +297,11 @@ FT_BEGIN_HEADER
/* This type is used to store 16.16 fixed-point values, like scaling */
/* values or matrix coefficients. */
/* */
- typedef signed long FT_Fixed;
+#ifdef _WIN64
+ typedef signed __int64 FT_Fixed;
+#else
+ typedef signed long FT_Fixed;
+#endif
/*************************************************************************/
diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c
index 93e6f81..b8002f1 100644
--- old_src/cid/type1cid.c
+++ src/cid/type1cid.c
@@ -18,6 +18,7 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include <ft2build.h>
+#include FT_CONFIG_CONFIG_H
#include "cidgload.c"
#include "cidload.c"