[71285] trunk/dports/python

[jmr at macports.org]

Revision: 71285
          http://trac.macports.org/changeset/71285
Author:   jmr at macports.org
Date:     2010-09-07 13:32:13 -0700 (Tue, 07 Sep 2010)
Log Message:
-----------
py26-pil, py27-pil: fix 1.1.7 regression that breaks Image.split() (#26393)

Modified Paths:
--------------
    trunk/dports/python/py26-pil/Portfile
    trunk/dports/python/py27-pil/Portfile

Added Paths:
-----------
    trunk/dports/python/py26-pil/files/pil-2009-raclette-fb7ce579f5f9.diff
    trunk/dports/python/py27-pil/files/pil-2009-raclette-fb7ce579f5f9.diff

Modified: trunk/dports/python/py26-pil/Portfile
===================================================================
--- trunk/dports/python/py26-pil/Portfile	2010-09-07 20:08:16 UTC (rev 71284)
+++ trunk/dports/python/py26-pil/Portfile	2010-09-07 20:32:13 UTC (rev 71285)
@@ -5,7 +5,7 @@
 
 name            py26-pil
 version         1.1.7
-revision        1
+revision        2
 license         MIT
 maintainers     jmr openmaintainer
 description     Python Imaging Library
@@ -22,7 +22,7 @@
 checksums       md5 fc14a54e1ce02a0225be8854bfba478e \
                 sha1 76c37504251171fda8da8e63ecb8bc42a69a5c81 \
                 rmd160 9af570fe100e250a4860314341fe3e6d695d7fde
-patchfiles      patch-setup.py
+patchfiles      patch-setup.py pil-2009-raclette-fb7ce579f5f9.diff
 
 depends_lib-append  port:freetype \
                     port:jpeg \

Added: trunk/dports/python/py26-pil/files/pil-2009-raclette-fb7ce579f5f9.diff
===================================================================
--- trunk/dports/python/py26-pil/files/pil-2009-raclette-fb7ce579f5f9.diff	                        (rev 0)
+++ trunk/dports/python/py26-pil/files/pil-2009-raclette-fb7ce579f5f9.diff	2010-09-07 20:32:13 UTC (rev 71285)
@@ -0,0 +1,24 @@
+# HG changeset patch -- Bitbucket.org
+# Project pil-2009-raclette
+# URL http://bitbucket.org/effbot/pil-2009-raclette/overview
+# User Fredrik Lundh <fredrik at effbot.org>
+# Date 1272193085 -7200
+# Node ID fb7ce579f5f96f7d9008f72ab03eef4f1c6db609
+# Parent  45c2debe0fc3d9632372a15826b1b64a35ff43c4
+Fixed split after open bug (regression in 1.1.7).
+
+--- PIL/Image.py
++++ PIL/Image.py
+@@ -1494,11 +1494,11 @@ class Image:
+     def split(self):
+         "Split image into bands"
+ 
++        self.load()
+         if self.im.bands == 1:
+             ims = [self.copy()]
+         else:
+             ims = []
+-            self.load()
+             for i in range(self.im.bands):
+                 ims.append(self._new(self.im.getband(i)))
+         return tuple(ims)

Modified: trunk/dports/python/py27-pil/Portfile
===================================================================
--- trunk/dports/python/py27-pil/Portfile	2010-09-07 20:08:16 UTC (rev 71284)
+++ trunk/dports/python/py27-pil/Portfile	2010-09-07 20:32:13 UTC (rev 71285)
@@ -5,6 +5,7 @@
 
 name            py27-pil
 version         1.1.7
+revision        1
 license         MIT
 maintainers     jmr openmaintainer
 description     Python Imaging Library
@@ -21,7 +22,7 @@
 checksums       md5 fc14a54e1ce02a0225be8854bfba478e \
                 sha1 76c37504251171fda8da8e63ecb8bc42a69a5c81 \
                 rmd160 9af570fe100e250a4860314341fe3e6d695d7fde
-patchfiles      patch-setup.py
+patchfiles      patch-setup.py pil-2009-raclette-fb7ce579f5f9.diff
 
 depends_lib-append  port:freetype \
                     port:jpeg \

Added: trunk/dports/python/py27-pil/files/pil-2009-raclette-fb7ce579f5f9.diff
===================================================================
--- trunk/dports/python/py27-pil/files/pil-2009-raclette-fb7ce579f5f9.diff	                        (rev 0)
+++ trunk/dports/python/py27-pil/files/pil-2009-raclette-fb7ce579f5f9.diff	2010-09-07 20:32:13 UTC (rev 71285)
@@ -0,0 +1,24 @@
+# HG changeset patch -- Bitbucket.org
+# Project pil-2009-raclette
+# URL http://bitbucket.org/effbot/pil-2009-raclette/overview
+# User Fredrik Lundh <fredrik at effbot.org>
+# Date 1272193085 -7200
+# Node ID fb7ce579f5f96f7d9008f72ab03eef4f1c6db609
+# Parent  45c2debe0fc3d9632372a15826b1b64a35ff43c4
+Fixed split after open bug (regression in 1.1.7).
+
+--- PIL/Image.py
++++ PIL/Image.py
+@@ -1494,11 +1494,11 @@ class Image:
+     def split(self):
+         "Split image into bands"
+ 
++        self.load()
+         if self.im.bands == 1:
+             ims = [self.copy()]
+         else:
+             ims = []
+-            self.load()
+             for i in range(self.im.bands):
+                 ims.append(self._new(self.im.getband(i)))
+         return tuple(ims)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100907/9243bf15/attachment.html>