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

Add the Red Hat fix for Pillow.

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pysollib/mfxutil.py
View file

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

2
scripts/cardset_viewer.py
View file

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