diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
commit | d00821e77f72d4af4ea30158c1c6e18ffff0875b (patch) | |
tree | b28b6cb077ae6b2457e30d49028fc978d8e2b59b /media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch | |
parent | 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (diff) | |
parent | 6a339b4f9ec107438bb71a6f9ca72fd42fbfd436 (diff) |
Merge branch 'next'
Diffstat (limited to 'media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch')
-rw-r--r-- | media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch deleted file mode 100644 index dc29c9c8e14f..000000000000 --- a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -Gentoo-Bug: https://bugs.gentoo.org/584128 - ---- a/photofilmstrip/core/ProjectFile.py -+++ b/photofilmstrip/core/ProjectFile.py -@@ -196,7 +196,7 @@ - def __ThumbToQuery(self, picId, pic): - pilThumb = PILBackend.GetThumbnail(pic, height=120) - thumbWidth, thumbHeight = pilThumb.size -- thumbData = buffer(pilThumb.tostring()) -+ thumbData = buffer(pilThumb.tobytes()) - - query = "INSERT INTO `thumbnail` (" \ - "picture_id, width, height, data" \ ---- a/photofilmstrip/core/renderer/CairoRenderer.py -+++ b/photofilmstrip/core/renderer/CairoRenderer.py -@@ -121,7 +121,7 @@ - def _PilToCairo(self, pilImg): - pilImg = pilImg.copy() - w, h = pilImg.size -- data = pilImg.convert('RGBA').tostring() -+ data = pilImg.convert('RGBA').tobytes() - buff = array.array('B', data) - cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_ARGB32, w, h) - # cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_RGB24, w, h) ---- a/photofilmstrip/core/renderer/PyGameRenderer.py -+++ b/photofilmstrip/core/renderer/PyGameRenderer.py -@@ -100,7 +100,7 @@ - def _PilToPyGame(self, pilImg): - mode = pilImg.mode - assert mode in "RGB", "RGBA" -- return pygame.image.fromstring(pilImg.tostring(), pilImg.size, mode) -+ return pygame.image.frombytes(pilImg.tobytes(), pilImg.size, mode) - - - # def CropAndResize(self, ctx, rect): |