Index: src/Texture.py =================================================================== --- FretsOnFire-src-1.3.110/src/Texture.py +++ FretsOnFire-src-1.3.110/src/Texture.py 2016-09-21 22:20:38.154533433 +0200 @@ -24,10 +24,9 @@ import Log import Config -import Image +from PIL import Image import pygame import StringIO -import PngImagePlugin from OpenGL.GL import * from OpenGL.GLU import * from Queue import Queue, Empty @@ -210,13 +209,13 @@ """Load the texture from a PIL image""" image = image.transpose(Image.FLIP_TOP_BOTTOM) if image.mode == "RGBA": - string = image.tostring('raw', 'RGBA', 0, -1) + string = image.tobytes('raw', 'RGBA', 0, -1) self.loadRaw(image.size, string, GL_RGBA, 4) elif image.mode == "RGB": - string = image.tostring('raw', 'RGB', 0, -1) + string = image.tobytes('raw', 'RGB', 0, -1) self.loadRaw(image.size, string, GL_RGB, 3) elif image.mode == "L": - string = image.tostring('raw', 'L', 0, -1) + string = image.tobytes('raw', 'L', 0, -1) self.loadRaw(image.size, string, GL_LUMINANCE, 1) else: raise TextureException("Unsupported image mode '%s'" % image.mode) @@ -256,7 +255,7 @@ # appears to be using PIL to do the conversion. string = pygame.image.tostring(surface, "RGB") image = Image.fromstring("RGB", surface.get_size(), string).convert("L") - string = image.tostring('raw', 'L', 0, -1) + string = image.tobytes('raw', 'L', 0, -1) self.loadRaw(surface.get_size(), string, GL_LUMINANCE, GL_INTENSITY8) else: if alphaChannel: @@ -275,7 +274,7 @@ # appears to be using PIL to do the conversion. string = pygame.image.tostring(surface, "RGB") image = Image.fromstring("RGB", surface.get_size(), string).convert("L") - string = image.tostring('raw', 'L', 0, -1) + string = image.tobytes('raw', 'L', 0, -1) self.loadSubRaw(surface.get_size(), position, string, GL_INTENSITY8) else: if alphaChannel: