1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

Add the Red Hat fix for Pillow.

Pillow is the fork of the Python Imaging Library. Currently using it
PySolFC crashes or causes a malloc corruption.
This commit is contained in:
Shlomi Fish 2013-07-08 20:05:07 +03:00
parent 8a3348962d
commit 026025614b
2 changed files with 9 additions and 9 deletions

View file

@ -41,18 +41,18 @@ from pysollib.settings import PACKAGE, TOOLKIT, USE_TILE
Image = ImageTk = ImageOps = None
if TOOLKIT == 'tk':
try: # PIL
import Image
import ImageTk
import ImageOps
from PIL import Image
from PIL import ImageTk
from PIL import ImageOps
except ImportError:
Image = None
else:
# for py2exe
import GifImagePlugin
import PngImagePlugin
import JpegImagePlugin
import BmpImagePlugin
import PpmImagePlugin
from PIL import GifImagePlugin
from PIL import PngImagePlugin
from PIL import JpegImagePlugin
from PIL import BmpImagePlugin
from PIL import PpmImagePlugin
Image._initialized = 2
USE_PIL = False
if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':

View file

@ -7,7 +7,7 @@ from glob import glob
from math import sqrt, sin, cos, pi
from Tkinter import *
try:
import Image, ImageTk
from PIL import Image, ImageTk
except ImportError:
Image = None