python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 01:46:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1003 from AurelienBallier/master

Browse Source 
Use PyQt4 if already imported
This commit is contained in:
wiredfool 2014-11-12 22:12:46 -08:00
commit 212f9d7d8b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PIL/ImageQt.py
View File

@ -18,12 +18,15 @@
from PIL import Image from PIL import Image
from PIL._util import isPath from PIL._util import isPath
import sys
try: if 'PyQt4.QtGui' not in sys.modules:
try:
from PyQt5.QtGui import QImage, qRgba from PyQt5.QtGui import QImage, qRgba
except: except:
from PyQt4.QtGui import QImage, qRgba from PyQt4.QtGui import QImage, qRgba
else: #PyQt4 is used
from PyQt4.QtGui import QImage, qRgba
## ##
# (Internal) Turns an RGB color into a Qt compatible color integer. # (Internal) Turns an RGB color into a Qt compatible color integer.