forked from dmgerman/xournal
-
Notifications
You must be signed in to change notification settings - Fork 1
/
xournal-64bit.patch
62 lines (57 loc) · 2.51 KB
/
xournal-64bit.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
diff --git a/src/ttsubset/sft.c b/src/ttsubset/sft.c
index e5beb94..f7e0dbf 100644
--- a/src/ttsubset/sft.c
+++ b/src/ttsubset/sft.c
@@ -739,7 +739,7 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf, guint32 glyphID, ControlPoint
index = GetUInt16(ptr, 2, 1);
ptr += 4;
- if (listFind(glyphlist, (void *) (int) index)) {
+ if (listFind(glyphlist, (void *) (long) index)) {
#ifdef DEBUG
fprintf(stderr, "Endless loop found in a compound glyph.\n");
fprintf(stderr, "%d -> ", index);
@@ -753,7 +753,7 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf, guint32 glyphID, ControlPoint
#endif
}
- listAppend(glyphlist, (void *) (int) index);
+ listAppend(glyphlist, (void *) (long) index);
#ifdef DEBUG2
fprintf(stderr,"glyphlist: += %d\n", index);
@@ -937,7 +937,7 @@ static int GetTTGlyphOutline(TrueTypeFont *ttf, guint32 glyphID, ControlPoint **
if (!glyphlist) {
glyphlistFlag = 1;
glyphlist = listNewEmpty();
- listAppend(glyphlist, (void *) glyphID);
+ listAppend(glyphlist, (void *) (long) glyphID);
}
res = GetCompoundTTOutline(ttf, glyphID, pointArray, metrics, glyphlist);
if (glyphlistFlag) {
@@ -1844,7 +1844,7 @@ int GetTTGlyphComponents(TrueTypeFont *ttf, guint32 glyphID, list glyphlist)
if (glyphID >= ttf->nglyphs) return 0;
ptr = glyf + ttf->goffsets[glyphID];
- listAppend(glyphlist, (void *) glyphID);
+ listAppend(glyphlist, (void *) (long) glyphID);
if (GetInt16(ptr, 0, 1) == -1) {
guint16 flags, index;
diff --git a/src/ttsubset/ttcr.c b/src/ttsubset/ttcr.c
index 907df81..07cc38a 100644
--- a/src/ttsubset/ttcr.c
+++ b/src/ttsubset/ttcr.c
@@ -1302,7 +1302,7 @@ void cmapAdd(TrueTypeTable *table, guint32 id, guint32 c, guint32 g)
guint32 glyfAdd(TrueTypeTable *table, GlyphData *glyphdata, TrueTypeFont *fnt)
{
list l;
- guint32 currentID;
+ glong currentID;
int ret, n, ncomponents;
list glyphlist;
GlyphData *gd;
@@ -1330,7 +1330,7 @@ guint32 glyfAdd(TrueTypeTable *table, GlyphData *glyphdata, TrueTypeFont *fnt)
listPositionAt(glyphlist, 1); /* glyphData->glyphID is always the first glyph on the list */
do {
int found = 0;
- currentID = (guint32) listCurrent(glyphlist);
+ currentID = (glong) listCurrent(glyphlist);
/* XXX expensive! should be rewritten with sorted arrays! */
listToFirst(l);
do {