| author | Rich Burridge <rich.burridge@oracle.com> |
| Wed, 18 Apr 2012 11:08:05 -0700 | |
| changeset 778 | 9d5e4d6466cd |
| parent 204 | 78dfe4707c7c |
| permissions | -rw-r--r-- |
|
204
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
1 |
--- gnuplot-4.4.0/term/gd.trm.orig Wed Feb 24 18:29:20 2010 |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
2 |
+++ gnuplot-4.4.0/term/gd.trm Mon Mar 28 16:41:55 2011 |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
3 |
@@ -978,7 +978,11 @@ |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
4 |
if (external_default) |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
5 |
png_state.ttffont = gp_strdup(external_default); |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
6 |
else /* Might as well try some plausible font; it's no worse than failing immediately */ |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
7 |
+#ifndef sun |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
8 |
png_state.ttffont = gp_strdup("arial");
|
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
9 |
+#else /* sun */ |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
10 |
+ png_state.ttffont = gp_strdup("LiberationSans-Regular");
|
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
11 |
+#endif /* sun */ |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
12 |
|
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
13 |
free(png_state.default_ttffont); |
|
78dfe4707c7c
7028339 Desire to have gnuplot in userland gate
David Marx <David.M.Marx@Oracle.Com>
parents:
diff
changeset
|
14 |
png_state.default_ttffont = gp_strdup(png_state.ttffont); |