diff options
| author | davilla <davilla@4pi.com> | 2011-10-10 20:31:26 -0400 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2011-10-11 00:19:00 -0400 |
| commit | 2799897f62c3bd61ccc30542a6d9925decf31d3d (patch) | |
| tree | 9804e07a798f1719c77667e8a99c701bacb1e617 /lib/addons | |
| parent | be38eb0ed742264711338b34675949f5b091e75e (diff) | |
[osx/ios] fixed, Imaging-1.1.7 has a design quirk where one can import it two different ways resulting in different python HASH for the same module. If the HASH is different then imaging calls exit(1) and everything dies. Mod to ignore this. Note Imaging-1.2 alpha changes this behavor to use one namespace ie. PIL
Diffstat (limited to 'lib/addons')
| -rw-r--r-- | lib/addons/script.module.pil/Imaging-1.1.7-access.patch | 13 | ||||
| -rw-r--r-- | lib/addons/script.module.pil/Makefile.in | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/addons/script.module.pil/Imaging-1.1.7-access.patch b/lib/addons/script.module.pil/Imaging-1.1.7-access.patch new file mode 100644 index 0000000000..dd51f4ac8e --- /dev/null +++ b/lib/addons/script.module.pil/Imaging-1.1.7-access.patch @@ -0,0 +1,13 @@ +diff -rupN Imaging-1.1.7/libImaging/Access.c Imaging-1.1.7-mod/libImaging/Access.c +--- Imaging-1.1.7/libImaging/Access.c 2009-10-31 20:44:12.000000000 -0400 ++++ Imaging-1.1.7-mod/libImaging/Access.c 2011-10-10 19:40:22.000000000 -0400 +@@ -32,7 +32,7 @@ add_item(const char* mode) + { + UINT32 i = hash(mode); + /* printf("hash %s => %d\n", mode, i); */ +- if (access_table[i].mode) { ++ if (access_table[i].mode && (strcmp(mode, access_table[i].mode) != 0)) { + fprintf(stderr, "AccessInit: hash collision: %d for both %s and %s\n", + i, mode, access_table[i].mode); + exit(1); + diff --git a/lib/addons/script.module.pil/Makefile.in b/lib/addons/script.module.pil/Makefile.in index 4fb5db97c3..a1f4d00e2e 100644 --- a/lib/addons/script.module.pil/Makefile.in +++ b/lib/addons/script.module.pil/Makefile.in @@ -41,6 +41,7 @@ $(SOURCE): $(ARCHIVE) cd $(SOURCE); \ patch -p1 < ../Imaging-1.1.7-crosscompiling-0.1.patch; \ patch -p1 < ../Imaging-1.1.7-setuptools-0.1.patch; \ + patch -p1 < ../Imaging-1.1.7-access.patch; \ sed -ie "s|"darwin"|"darwinNot"|g" "setup.py"; \ fi |