mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-11-11 04:07:21 +03:00
a7e3b2e47b
There are two main issues fixed with this commit: * bytes vs. str: All file, image, and palette data are now handled as bytes. A new _binary module consolidates the hacks needed to do this across Python versions. tostring/fromstring methods have been renamed to tobytes/frombytes, but the Python 2.6/2.7 versions alias them to the old names for compatibility. Users should move to tobytes/frombytes. One other potentially-breaking change is that text data in image files (such as tags, comments) are now explicitly handled with a specific character encoding in mind. This works well with the Unicode str in Python 3, but may trip up old code expecting a straight byte-for-byte translation to a Python string. This also required a change to Gohlke's tags tests (in Tests/test_file_png.py) to expect Unicode strings from the code. * True div vs. floor div: Many division operations used the "/" operator to do floor division, which is now the "//" operator in Python 3. These were fixed. As of this commit, on the first pass, I have one failing test (improper handling of a slice object in a C module, test_imagepath.py) in Python 3, and three that that I haven't tried running yet (test_imagegl, test_imagegrab, and test_imageqt). I also haven't tested anything on Windows. All but the three skipped tests run flawlessly against Pythons 2.6 and 2.7.
85 lines
2.5 KiB
Python
85 lines
2.5 KiB
Python
#
|
|
# The Python Imaging Library.
|
|
# $Id$
|
|
#
|
|
# a simple Qt image interface.
|
|
#
|
|
# history:
|
|
# 2006-06-03 fl: created
|
|
# 2006-06-04 fl: inherit from QImage instead of wrapping it
|
|
# 2006-06-05 fl: removed toimage helper; move string support to ImageQt
|
|
#
|
|
# Copyright (c) 2006 by Secret Labs AB
|
|
# Copyright (c) 2006 by Fredrik Lundh
|
|
#
|
|
# See the README file for information on usage and redistribution.
|
|
#
|
|
|
|
from . import Image
|
|
|
|
from PyQt4.QtGui import QImage, qRgb
|
|
|
|
##
|
|
# (Internal) Turns an RGB color into a Qt compatible color integer.
|
|
|
|
def rgb(r, g, b):
|
|
# use qRgb to pack the colors, and then turn the resulting long
|
|
# into a negative integer with the same bitpattern.
|
|
return (qRgb(r, g, b) & 0xffffff) - 0x1000000
|
|
|
|
##
|
|
# An PIL image wrapper for Qt. This is a subclass of PyQt4's QImage
|
|
# class.
|
|
#
|
|
# @param im A PIL Image object, or a file name (given either as Python
|
|
# string or a PyQt string object).
|
|
|
|
class ImageQt(QImage):
|
|
|
|
def __init__(self, im):
|
|
|
|
data = None
|
|
colortable = None
|
|
|
|
# handle filename, if given instead of image name
|
|
if hasattr(im, "toUtf8"):
|
|
# FIXME - is this really the best way to do this?
|
|
im = unicode(im.toUtf8(), "utf-8")
|
|
if Image.isStringType(im):
|
|
im = Image.open(im)
|
|
|
|
if im.mode == "1":
|
|
format = QImage.Format_Mono
|
|
elif im.mode == "L":
|
|
format = QImage.Format_Indexed8
|
|
colortable = []
|
|
for i in range(256):
|
|
colortable.append(rgb(i, i, i))
|
|
elif im.mode == "P":
|
|
format = QImage.Format_Indexed8
|
|
colortable = []
|
|
palette = im.getpalette()
|
|
for i in range(0, len(palette), 3):
|
|
colortable.append(rgb(*palette[i:i+3]))
|
|
elif im.mode == "RGB":
|
|
data = im.tobytes("raw", "BGRX")
|
|
format = QImage.Format_RGB32
|
|
elif im.mode == "RGBA":
|
|
try:
|
|
data = im.tobytes("raw", "BGRA")
|
|
except SystemError:
|
|
# workaround for earlier versions
|
|
r, g, b, a = im.split()
|
|
im = Image.merge("RGBA", (b, g, r, a))
|
|
format = QImage.Format_ARGB32
|
|
else:
|
|
raise ValueError("unsupported image mode %r" % im.mode)
|
|
|
|
# must keep a reference, or Qt will crash!
|
|
self.__data = data or im.tobytes()
|
|
|
|
QImage.__init__(self, self.__data, im.size[0], im.size[1], format)
|
|
|
|
if colortable:
|
|
self.setColorTable(colortable)
|