Merge branch 'python-pillow:main' into ImageStat_getcount_opt

CHANGES.rst

@@ -5,6 +5,9 @@ Changelog (Pillow)
 10.2.0 (unreleased)
 -------------------
 
+- Fixed closing file pointer with olefile 0.47 #7594
+  [radarhere]
+
 - Raise ValueError when TrueType font size is not greater than zero #7584
   [akx, radarhere]
 

RELEASING.md

@@ -94,7 +94,6 @@ Released as needed privately to individual vendors for critical security-related
 
 ## Source and Binary Distributions
 
-### macOS and Linux
 * [ ] Download sdist and wheels from the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml)
   and copy into `dist/`. For example using [GitHub CLI](https://github.com/cli/cli):
   ```bash
@@ -104,14 +103,6 @@ Released as needed privately to individual vendors for critical security-related
 * [ ] Download the Linux aarch64 wheels created by Travis CI from [GitHub releases](https://github.com/python-pillow/Pillow/releases)
   and copy into `dist`.
 
-### Windows
-* [ ] Download the artifacts from the [GitHub Actions "Test Windows" workflow](https://github.com/python-pillow/Pillow/actions/workflows/test-windows.yml)
-  and copy into `dist/`. For example using [GitHub CLI](https://github.com/cli/cli):
-  ```bash
-  gh run download --dir dist
-  # select dist-x.y.z
-  ```
-
 ## Publicize Release
 
 * [ ] Announce release availability via [Twitter](https://twitter.com/pythonpillow) and [Mastodon](https://fosstodon.org/@pillow) e.g. https://twitter.com/PythonPillow/status/1013789184354603010

docs/installation.rst

@@ -95,11 +95,10 @@ and :pypi:`olefile` for Pillow to read FPX and MIC images::
 
 .. tab:: Windows
 
-    .. warning:: Pillow > 9.5.0 no longer includes 32-bit wheels.
-
-    We provide Pillow binaries for Windows compiled for the matrix of
-    supported Pythons in 64-bit versions in the wheel format. These binaries include
-    support for all optional libraries except libimagequant and libxcb. Raqm support
+    We provide Pillow binaries for Windows compiled for the matrix of supported
+    Pythons in the wheel format. These include x86, x86-64 and arm64 versions
+    (with the exception of Python 3.8 on arm64). These binaries include support
+    for all optional libraries except libimagequant and libxcb. Raqm support
     requires FriBiDi to be installed separately::
 
         python3 -m pip install --upgrade pip

src/PIL/FpxImagePlugin.py

@@ -227,6 +227,7 @@ class FpxImageFile(ImageFile.ImageFile):
                     break  # isn't really required
 
         self.stream = stream
+        self._fp = self.fp
         self.fp = None
 
     def load(self):

src/PIL/MicImagePlugin.py

@@ -66,6 +66,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
         self._n_frames = len(self.images)
         self.is_animated = self._n_frames > 1
 
+        self.__fp = self.fp
         self.seek(0)
 
     def seek(self, frame):
@@ -87,10 +88,12 @@ class MicImageFile(TiffImagePlugin.TiffImageFile):
         return self.frame
 
     def close(self):
+        self.__fp.close()
         self.ole.close()
         super().close()
 
     def __exit__(self, *args):
+        self.__fp.close()
         self.ole.close()
         super().__exit__()