| author | April Chin <april.chin@oracle.com> |
| Fri, 10 Apr 2015 11:48:05 -0700 | |
| changeset 4096 | b5c3f8ed096c |
| permissions | -rw-r--r-- |
|
4096
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
# This fix comes from the upstream Pillow fork of PIL: |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
# https://github.com/python-pillow/Pillow/commit/c6040f618d8f2706a7b46d1cdf37d1a587f9701f |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
|
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
--- Imaging-1.1.7-orig/_imagingft.c 2009-10-31 17:44:12.000000000 -0700 |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
+++ Imaging-1.1.7/_imagingft.c 2015-04-09 08:30:10.889971000 -0700 |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
@@ -70,7 +70,11 @@ |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
const char* message; |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
} ft_errors[] = |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
|
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
+#if defined(USE_FREETYPE_2_1) |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
+#include FT_ERRORS_H |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
+#else |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
#include <freetype/fterrors.h> |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
+#endif |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
|
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
/* -------------------------------------------------------------------- */ |
|
b5c3f8ed096c
20854800 python imaging doesn't build on s12-71
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
/* font objects */ |