|
20263
|
1 |
--- libgnomeprint-sun-1.116.1/libgnomeprint/gp-tt-t1.c-orig 2010-10-08 15:06:11.224893380 -0500
|
|
|
2 |
+++ libgnomeprint-sun-1.116.1/libgnomeprint/gp-tt-t1.c 2010-10-08 15:11:17.472069375 -0500
|
|
|
3 |
@@ -357,7 +357,7 @@ static int stemoverlap (struct stem *s1,
|
|
|
4 |
static gint subfrombase (gint from, gint to);
|
|
|
5 |
static int gssentry (struct gentry *ge, struct stem *hs, gshort *hpairs, gint nhs, struct stem *vs, gshort *vpairs, gint nvs, struct stembounds *s, gshort *egp, gint *nextvsi, gint *nexthsi);
|
|
|
6 |
static int findstemat (gint value, gint origin, struct gentry *ge, struct stem *sp, gshort *pairs, gint ns, gint prevbest);
|
|
|
7 |
-static void getline (gchar **src);
|
|
|
8 |
+static void mygetline (gchar **src);
|
|
|
9 |
static gchar *eexec_start (gchar *line);
|
|
|
10 |
static gchar *eexec_string (gchar *string);
|
|
|
11 |
static const gchar *eexec_byte (guchar c);
|
|
|
12 |
@@ -899,7 +899,7 @@ ttf_type1_dump (guchar *src, gint size)
|
|
|
13 |
|
|
|
14 |
while (*(src + cnt) != 0) {
|
|
|
15 |
string = src + cnt;
|
|
|
16 |
- getline ((gchar **) &string);
|
|
|
17 |
+ mygetline ((gchar **) &string);
|
|
|
18 |
cnt = string - src;
|
|
|
19 |
if (!strcmp (line, "currentfile eexec\n")) {
|
|
|
20 |
if ((buf = eexec_start (line)) != NULL) {
|
|
|
21 |
@@ -5054,7 +5054,7 @@ rrcurveto (gint dx1, gint dy1, gint dx2,
|
|
|
22 |
|
|
|
23 |
/* ttf_type1_dump */
|
|
|
24 |
static void
|
|
|
25 |
-getline (gchar **src)
|
|
|
26 |
+mygetline (gchar **src)
|
|
|
27 |
{
|
|
|
28 |
gint c;
|
|
|
29 |
guchar *p = line;
|