[med-svn] [dicompyler] 06/15: Patch for pillow which removed tostring

[Vojtech Kulvait]

This is an automated email from the git hooks/post-receive script.

kulvait-guest pushed a commit to branch master
in repository dicompyler.

commit 796393d263530968eaab0d41160596870877488f
Author: Vojtěch Kulvait <kulvait at gmail.com>
Date:   Tue Sep 19 00:48:40 2017 +0200

    Patch for pillow which removed tostring
---
 .../{01.patch => 092017F_pillowtostringtobytes.patch}  | 18 ++++++++++--------
 debian/patches/series                                  |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/patches/01.patch b/debian/patches/092017F_pillowtostringtobytes.patch
similarity index 58%
rename from debian/patches/01.patch
rename to debian/patches/092017F_pillowtostringtobytes.patch
index 4613dbf..de14118 100644
--- a/debian/patches/01.patch
+++ b/debian/patches/092017F_pillowtostringtobytes.patch
@@ -1,23 +1,25 @@
 Author: Vojtěch Kulvait <kulvait at gmail.com>
-Last-Update: Mon Sep 18 14:44:01 CEST 2017
+Last-Update: Mon Sep 19 00:30:00 CEST 2017
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854837
-Description: Added support for pillow >=3.0.0 addressing changes due to commit https://github.com/python-pillow/Pillow/commit/71c95c8e5f3bba1845444a246d04646825e6bab3, small indentation fix.
+Description: Added support for pillow >=3.0.0 addressing changes due to commit https://github.com/python-pillow/Pillow/commit/71c95c8e5f3bba1845444a246d04646825e6bab3, small indentation fix. 
 
---- a/dicompyler/guiutil.py
-+++ b/dicompyler/guiutil.py
-@@ -78,12 +78,12 @@ def convert_pil_to_wx(pil, alpha=True):
+Index: dicompyler/dicompyler/guiutil.py
+===================================================================
+--- dicompyler.orig/dicompyler/guiutil.py
++++ dicompyler/dicompyler/guiutil.py
+@@ -79,12 +79,12 @@ def convert_pil_to_wx(pil, alpha=True):
          Code taken from Dave Witten's imViewer-Simple.py in pydicom contrib."""
      if alpha:
          image = apply(wx.EmptyImage, pil.size)
 -        image.SetData(pil.convert("RGB").tostring())
 -        image.SetAlphaData(pil.convert("RGBA").tostring()[3::4])
-+        image.SetData(pil.convert("RGB").tobytes())#Pillow >= 3.0.0
-+        image.SetAlphaData(pil.convert("RGBA").tobytes()[3::4])#Pillow >= 3.0.0
++        image.SetData(pil.convert("RGB").tobytes())#Fixes commit github.com/python-pillow/Pillow/commit/71c95c8e5f3bba1845444a246d04646825e6bab3
++        image.SetAlphaData(pil.convert("RGBA").tobytes()[3::4])
      else:
          image = wx.EmptyImage(pil.size[0], pil.size[1])
          new_image = pil.convert('RGB')
 -        data = new_image.tostring()
-+        data = new_image.tobytes()#Fixes this commit https://github.com/python-pillow/Pillow/commit/71c95c8e5f3bba1845444a246d04646825e6bab3
++        data = new_image.tobytes()
          image.SetData(data)
      return image
  
diff --git a/debian/patches/series b/debian/patches/series
index a5056fd..49dfdbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ fix_DicomImporterDialog.patch
 092017B_fiximportasterixs.patch
 092017C_fixwx30.patch
 092017E_newwxmpl.patch
+092017F_pillowtostringtobytes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicompyler.git