Merge pull request #593 from wiredfool/docs

Doc updates
This commit is contained in:
Alex Clark ☺ 2014-04-02 04:50:44 -04:00
commit 12398f632d
3 changed files with 8 additions and 8 deletions

View File

@ -156,6 +156,8 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options:
JPEG 2000 JPEG 2000
^^^^^^^^^ ^^^^^^^^^
.. versionadded:: 2.4.0
PIL reads and writes JPEG 2000 files containing ``L``, ``LA``, ``RGB`` or PIL reads and writes JPEG 2000 files containing ``L``, ``LA``, ``RGB`` or
``RGBA`` data. It can also read files containing ``YCbCr`` data, which it ``RGBA`` data. It can also read files containing ``YCbCr`` data, which it
converts on read into ``RGB`` or ``RGBA`` depending on whether or not there is converts on read into ``RGB`` or ``RGBA`` depending on whether or not there is

View File

@ -18,12 +18,9 @@ Python Imaging Library by Fredrik Lundh and Contributors.
To start using Pillow, please read the :doc:`installation To start using Pillow, please read the :doc:`installation
instructions <installation>`. instructions <installation>`.
If you can't find the information you need, try the old `PIL Handbook`_, but be You can get the source and contribute at
aware that it was last updated for PIL 1.1.5. You can download archives and old https://github.com/python-imaging/Pillow. You can download archives
versions from `PyPI <https://pypi.python.org/pypi/Pillow>`_. You can get the and old versions from `PyPI <https://pypi.python.org/pypi/Pillow>`_.
source and contribute at https://github.com/python-imaging/Pillow.
.. _PIL Handbook: http://effbot.org/imagingbook/pil-index.htm
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2

View File

@ -66,13 +66,14 @@ Many of Pillow's features require external libraries:
* **libwebp** provides the Webp format. * **libwebp** provides the Webp format.
* Pillow has been tested with version **0.1.3**, which does not read * Pillow has been tested with version **0.1.3**, which does not read
transparent webp files. Version **0.3.0** supports transparency. transparent webp files. Versions **0.3.0** and **0.4.0** support
transparency.
* **tcl/tk** provides support for tkinter bitmap and photo images. * **tcl/tk** provides support for tkinter bitmap and photo images.
* **openjpeg** provides JPEG 2000 functionality. * **openjpeg** provides JPEG 2000 functionality.
* Pillow 2.4 requires openjpeg 2.0.0. * Pillow has been tested with openjpeg **2.0.0**.
If the prerequisites are installed in the standard library locations for your If the prerequisites are installed in the standard library locations for your
machine (e.g. :file:`/usr` or :file:`/usr/local`), no additional configuration machine (e.g. :file:`/usr` or :file:`/usr/local`), no additional configuration