Merge pull request #7905 from radarhere/current

docs/handbook/image-file-formats.rst

@@ -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
+Pillow reads Kodak FlashPix files. Only the highest resolution image is read from the
-resolution image is read from the file, and the viewing transform is not taken
+file, and the viewing transform is not taken into account.
-into account.
 
 To enable FPX support, you must install :pypi:`olefile`.
 

docs/reference/ImageFilter.rst

@@ -23,8 +23,7 @@ Example: Filter an image
 Filters
 -------
 
-The current version of the library provides the following set of predefined
+Pillow provides the following set of predefined image enhancement filters:
-image enhancement filters:
 
 * **BLUR**
 * **CONTOUR**

docs/reference/ImagePath.rst

@@ -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
+    slicing as usual. However, this does not support slice assignment, or item
-    assignment, or item and slice deletion.
+    and slice deletion.
 
     :param xy: A sequence. The sequence can contain 2-tuples [(x, y), ...]
                or a flat list of numbers [x, y, ...].

src/PIL/Image.py

@@ -894,9 +894,8 @@ class Image:
         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
+        This supports all possible conversions between "L", "RGB" and "CMYK". The
-        "L", "RGB" and "CMYK". The ``matrix`` argument only supports "L"
+        ``matrix`` argument only supports "L" and "RGB".
-        and "RGB".
 
         When translating a color image to grayscale (mode "L"),
         the library uses the ITU-R 601-2 luma transform::
@@ -1824,9 +1823,8 @@ class Image:
                class Example(Image.ImagePointHandler):
                  def point(self, data):
                    # Return result
-        :param mode: Output mode (default is same as input).  In the
+        :param mode: Output mode (default is same as input). This can only be used if
-           current version, this can only be used if the source image
+           the source image has mode "L" or "P", and the output has mode "1" or the
-           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.
         """
@@ -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
+    The default parameters used for the "raw" decoder differs from that used for
-    differs from that used for :py:func:`~PIL.Image.frombytes`.  This is a
+    :py:func:`~PIL.Image.frombytes`. This is a bug, and will probably be fixed in a
-    bug, and will probably be fixed in a future release.  The current release
+    future release. The current release issues a warning if you do this; to disable
-    issues a warning if you do this; to disable the warning, you should provide
+    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. See: :ref:`concept-modes`.
     :param size: The image size.

src/PIL/ImageFilter.py

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

src/_imagingcms.c

@@ -52,7 +52,7 @@ https://www.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)