Commit Graph

29 Commits

Author SHA1 Message Date
Andrew Murray
ea3be60c03 Converted documentation 2016-09-24 19:10:46 +10:00
Hugo
1ab30d0ba5 Catch RuntimeError when importing Qt4
In case PySide is already imported
2016-06-22 11:25:59 +03:00
Hugo
1d47ff5f4d Fix for program importing PyQt4 when PyQt5 also installed
Fixes https://github.com/python-pillow/Pillow/issues/1939 using suggested solution.
2016-06-07 16:17:20 +03:00
Andrew Murray
c27110ab56 Flake8 fixes 2015-12-10 21:34:02 +11:00
Andrew Murray
2d0b6987a0 Changed ImageQt import of Image 2015-11-30 22:06:18 +11:00
Christoph Gohlke
6736344703 Py3 fixes for ImageQt.align8to32 2015-09-29 22:28:42 -07:00
Eric L Frederich
e67a4c4270 preserve alpha during conversion; add tests; found bug and added TODOs 2015-09-18 16:15:24 -04:00
Eric L Frederich
86e775daa3 bug fix: Qt wants data aligned to 32 bits
Images in Qt show up incorrectly if each line is not aligned to 32 bits.

It is pretty common for an image's lines to be 32-bit alinged by chance.
Obviously any 32-bit image will not have any problem.
For the bug to manifest itself you'd need...
* a 1-bit image whose width is not a multiple of 32
* an 8-bit image who width is not a multiple of 4

Testing more images now and added a 7x13 png test image
2015-09-18 16:07:35 -04:00
Andrew Murray
b553ad7a70 Further fixes 2015-06-21 16:33:55 +10:00
Andrew Murray
33d51d4255 Flake8 and health fixes 2015-06-19 15:36:23 +10:00
Andrew Murray
43e2c92802 Removed unused imports 2015-06-19 15:35:56 +10:00
Andrew Murray
fa1c4bffaf Do not attempt to subclass QImage if Qt is not installed 2015-06-18 11:21:14 +10:00
Andrew Murray
b318595666 Re-added ImageQt class 2015-06-18 11:21:14 +10:00
Roman Inflianskas
2d706d74dc add functions to convert: Image <-> QImage; Image <-> QPixmap (see #897) 2015-06-18 11:21:14 +10:00
Andrew Murray
3d52e797f8 Adjusted ImageQt use of unicode() for 2/3 compatibility 2015-05-07 21:47:08 +10:00
Andrew Murray
d1c182cadc Various Flake8 fixes 2015-04-24 09:26:52 +10:00
hugovk
c859e3bf40 Some landscape.io fixes 2014-11-27 21:43:45 +02:00
holger
100309feaf [ADD] added PySide compability 2014-11-20 23:08:58 +01:00
Aurélien Ballier
37252a67cc Fix bad importà 2014-11-11 19:39:05 +01:00
Aurélien Ballier
f3284e57a6 Merge remote-tracking branch 'upstream/master'
Conflicts:
	PIL/ImageQt.py
2014-11-11 18:00:00 +01:00
hugovk
1335006cd7 flake8 2014-08-28 14:44:19 +03:00
wiredfool
dbecc1cb70 Fix for failing ImageQt with mode 'L' image 2013-11-20 22:20:13 -08:00
Aurélien Ballier
938323bd2b Add Qt5 support. 2013-11-20 21:34:33 -08:00
Aurelien Ballier
2a3422335b Fix PyQt4&5 support. 2013-11-13 12:34:09 +01:00
Alex Clark
fd29e707e9 Apply @Arfrever patch, fixes #258 2013-06-30 07:04:42 -04:00
Alex Clark
3020c16eaa Fix imports 2013-03-07 11:20:28 -05:00
Brian Crowell
a7e3b2e47b py3k: The big push
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.
2013-01-10 08:46:56 -06:00
Brian Crowell
83ff0b3b31 py3k: Use relative imports
In py3k, imports are absolute unless using the "from . import" syntax.

This commit also solves a recursive import between Image, ImageColor, and
ImagePalette by delay-importing ImagePalette in Image.

I'm not too keen on this commit because the syntax is ugly. I might go back
and prefer the prettier "from PIL import".
2013-01-10 08:46:48 -06:00
Alex Clark
9a640e3157 Forking PIL 2010-07-30 22:52:47 -04:00