python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-24 17:06:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Many links to mode concept anchor [ci skip]

Browse Source
This commit is contained in:
wiredfool 2014-11-19 12:49:27 -08:00
parent eedff2d59b
commit d1f4633c7b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PIL/Image.py
View File

@ -804,7 +804,7 @@ class Image:
use other thresholds, use the :py:meth:`~PIL.Image.Image.point` use other thresholds, use the :py:meth:`~PIL.Image.Image.point`
method. method.
:param mode: The requested mode. :param mode: The requested mode. See: :ref:`concept-modes`.
:param matrix: An optional conversion matrix. If given, this :param matrix: An optional conversion matrix. If given, this
should be 4- or 16-tuple containing floating point values. should be 4- or 16-tuple containing floating point values.
:param dither: Dithering method, used when converting from :param dither: Dithering method, used when converting from
@ -2007,7 +2007,8 @@ def new(mode, size, color=0):
""" """
Creates a new image with the given mode and size. Creates a new image with the given mode and size.
:param mode: The mode to use for the new image. :param mode: The mode to use for the new image. See:
:ref:`concept-modes`.
:param size: A 2-tuple, containing (width, height) in pixels. :param size: A 2-tuple, containing (width, height) in pixels.
:param color: What color to use for the image. Default is black. :param color: What color to use for the image. Default is black.
If given, this should be a single integer or floating point value If given, this should be a single integer or floating point value
@ -2047,7 +2048,7 @@ def frombytes(mode, size, data, decoder_name="raw", *args):
:py:class:`~io.BytesIO` object, and use :py:func:`~PIL.Image.open` to load :py:class:`~io.BytesIO` object, and use :py:func:`~PIL.Image.open` to load
it. it.
:param mode: The image mode. :param mode: The image mode. See: :ref:`concept-modes`.
:param size: The image size. :param size: The image size.
:param data: A byte buffer containing raw data for the given mode. :param data: A byte buffer containing raw data for the given mode.
:param decoder_name: What decoder to use. :param decoder_name: What decoder to use.
@ -2099,7 +2100,7 @@ def frombuffer(mode, size, data, decoder_name="raw", *args):
issues a warning if you do this; to disable the warning, you should provide issues a warning if you do this; to disable the warning, you should provide
the full set of parameters. See below for details. the full set of parameters. See below for details.
:param mode: The image mode. :param mode: The image mode. See: :ref:`concept-modes`.
:param size: The image size. :param size: The image size.
:param data: A bytes or other buffer object containing raw :param data: A bytes or other buffer object containing raw
data for the given mode. data for the given mode.
@ -2150,7 +2151,8 @@ def fromarray(obj, mode=None):
:param obj: Object with array interface :param obj: Object with array interface
:param mode: Mode to use (will be determined from type if None) :param mode: Mode to use (will be determined from type if None)
:returns: An image memory. See: :ref:`concept-modes`.
:returns: An image object.
.. versionadded:: 1.1.6 .. versionadded:: 1.1.6
""" """
@ -2367,7 +2369,8 @@ def merge(mode, bands):
""" """
Merge a set of single band images into a new multiband image. Merge a set of single band images into a new multiband image.
:param mode: The mode to use for the output image. :param mode: The mode to use for the output image. See:
:ref:`concept-modes`.
:param bands: A sequence containing one single-band image for :param bands: A sequence containing one single-band image for
each band in the output image. All bands must have the each band in the output image. All bands must have the
same size. same size.

2
docs/reference/Image.rst
View File

@ -164,7 +164,7 @@ Instances of the :py:class:`Image` class have the following attributes:
Image mode. This is a string specifying the pixel format used by the image. Image mode. This is a string specifying the pixel format used by the image.
Typical values are “1”, “L”, “RGB”, or “CMYK.” See Typical values are “1”, “L”, “RGB”, or “CMYK.” See
:doc:`../handbook/concepts` for a full list. :ref:`concept-modes` for a full list.
:type: :py:class:`string` :type: :py:class:`string`