Skip to content

Commit

Permalink
Merge pull request #7905 from radarhere/current
Browse files Browse the repository at this point in the history
  • Loading branch information
hugovk committed Mar 27, 2024
2 parents 6ca8bfb + 2c6258b commit fac81d6
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 34 deletions.
5 changes: 2 additions & 3 deletions docs/handbook/image-file-formats.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1355,9 +1355,8 @@ The :py:meth:`~PIL.Image.open` method sets the following
FPX
^^^

Pillow reads Kodak FlashPix files. In the current version, only the highest
resolution image is read from the file, and the viewing transform is not taken
into account.
Pillow reads Kodak FlashPix files. Only the highest resolution image is read from the
file, and the viewing transform is not taken into account.

To enable FPX support, you must install :pypi:`olefile`.

Expand Down
3 changes: 1 addition & 2 deletions docs/reference/ImageFilter.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Example: Filter an image
Filters
-------

The current version of the library provides the following set of predefined
image enhancement filters:
Pillow provides the following set of predefined image enhancement filters:

* **BLUR**
* **CONTOUR**
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/ImagePath.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ vector data. Path objects can be passed to the methods on the

The path object implements most parts of the Python sequence interface, and
behaves like a list of (x, y) pairs. You can use len(), item access, and
slicing as usual. However, the current version does not support slice
assignment, or item and slice deletion.
slicing as usual. However, this does not support slice assignment, or item
and slice deletion.

:param xy: A sequence. The sequence can contain 2-tuples [(x, y), ...]
or a flat list of numbers [x, y, ...].
Expand Down
19 changes: 8 additions & 11 deletions src/PIL/Image.py
Original file line number Diff line number Diff line change
Expand Up @@ -894,9 +894,8 @@ def convert(
omitted, a mode is chosen so that all information in the image
and the palette can be represented without a palette.
The current version supports all possible conversions between
"L", "RGB" and "CMYK". The ``matrix`` argument only supports "L"
and "RGB".
This supports all possible conversions between "L", "RGB" and "CMYK". The
``matrix`` argument only supports "L" and "RGB".
When translating a color image to grayscale (mode "L"),
the library uses the ITU-R 601-2 luma transform::
Expand Down Expand Up @@ -1824,9 +1823,8 @@ def point(self, lut, mode: str | None = None) -> Image:
class Example(Image.ImagePointHandler):
def point(self, data):
# Return result
:param mode: Output mode (default is same as input). In the
current version, this can only be used if the source image
has mode "L" or "P", and the output has mode "1" or the
:param mode: Output mode (default is same as input). This can only be used if
the source image has mode "L" or "P", and the output has mode "1" or the
source image mode is "I" and the output mode is "L".
:returns: An :py:class:`~PIL.Image.Image` object.
"""
Expand Down Expand Up @@ -3020,11 +3018,10 @@ def frombuffer(mode, size, data, decoder_name="raw", *args):
If you have an entire image file in a string, wrap it in a
:py:class:`~io.BytesIO` object, and use :py:func:`~PIL.Image.open` to load it.
In the current version, the default parameters used for the "raw" decoder
differs from that used for :py:func:`~PIL.Image.frombytes`. This is a
bug, and will probably be fixed in a future release. The current release
issues a warning if you do this; to disable the warning, you should provide
the full set of parameters. See below for details.
The default parameters used for the "raw" decoder differs from that used for
:py:func:`~PIL.Image.frombytes`. This is a bug, and will probably be fixed in a
future release. The current release issues a warning if you do this; to disable
the warning, you should provide the full set of parameters. See below for details.
:param mode: The image mode. See: :ref:`concept-modes`.
:param size: The image size.
Expand Down
27 changes: 12 additions & 15 deletions src/PIL/ImageFilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,18 @@ def filter(self, image):

class Kernel(BuiltinFilter):
"""
Create a convolution kernel. The current version only
supports 3x3 and 5x5 integer and floating point kernels.
In the current version, kernels can only be applied to
"L" and "RGB" images.
:param size: Kernel size, given as (width, height). In the current
version, this must be (3,3) or (5,5).
:param kernel: A sequence containing kernel weights. The kernel will
be flipped vertically before being applied to the image.
:param scale: Scale factor. If given, the result for each pixel is
divided by this value. The default is the sum of the
kernel weights.
:param offset: Offset. If given, this value is added to the result,
after it has been divided by the scale factor.
Create a convolution kernel. This only supports 3x3 and 5x5 integer and floating
point kernels.
Kernels can only be applied to "L" and "RGB" images.
:param size: Kernel size, given as (width, height). This must be (3,3) or (5,5).
:param kernel: A sequence containing kernel weights. The kernel will be flipped
vertically before being applied to the image.
:param scale: Scale factor. If given, the result for each pixel is divided by this
value. The default is the sum of the kernel weights.
:param offset: Offset. If given, this value is added to the result, after it has
been divided by the scale factor.
"""

name = "Kernel"
Expand Down
2 changes: 1 addition & 1 deletion src/_imagingcms.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ kevin@cazabon.com\n\
*/

/* known to-do list with current version:
/* known to-do list:
Verify that PILmode->littleCMStype conversion in findLCMStype is correct for all
PIL modes (it probably isn't for the more obscure ones)
Expand Down

0 comments on commit fac81d6

Please sign in to comment.