Merge branch 'main' into modes

Signed-off-by: Isotr0py <[email protected]>

.github/workflows/benchmarks.yml

@@ -1,6 +1,14 @@
 name: Benchmarks
 
-on: [push, pull_request]
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 env:
   RUSTFLAGS: -C debuginfo=0  # Do not produce debug symbols to keep memory usage down
@@ -41,9 +49,10 @@ jobs:
       - name: Install Plugin
         run: |
           brew install jpeg-xl
-          export DEP_JXL_LIB=/opt/homebrew/Cellar/jpeg-xl/0.11.0/lib
-          export DEP_BROTLI_LIB=/opt/homebrew/Cellar/brotli/1.1.0/lib
-          export DEP_HWY_LIB=/opt/homebrew/Cellar/highway/1.2.0/lib
+          export DEP_JXL_LIB=$(brew --prefix jpeg-xl)'/lib'
+          export DEP_BROTLI_LIB=$(brew --prefix brotli)'/lib'
+          export DEP_HWY_LIB=$(brew --prefix highway)'/lib'
+
           source venv/bin/activate
           pip install maturin
           maturin develop --features dynamic

.github/workflows/release.yml

@@ -95,7 +95,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '>=3.9 <=3.13'
           architecture: ${{ matrix.target }}
 
       - name: Build wheels
@@ -135,24 +135,23 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '>=3.9 <=3.13'
 
       - name: Check dependencys
         run: |
           brew install jpeg-xl
-          ls /opt/homebrew/Cellar/jpeg-xl/
-          ls /opt/homebrew/Cellar/brotli/
-          ls /opt/homebrew/Cellar/highway/
+          echo DEP_JXL_LIB=$(brew --prefix jpeg-xl)'/lib' >> $GITHUB_ENV
+          echo DEP_BROTLI_LIB=$(brew --prefix brotli)'/lib' >> $GITHUB_ENV
+          echo DEP_HWY_LIB=$(brew --prefix highway)'/lib' >> $GITHUB_ENV
 
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         env: 
           RUST_BACKTRACE: 1
           MACOSX_DEPLOYMENT_TARGET: 12.7
-          # from homebrew
-          DEP_JXL_LIB: /opt/homebrew/Cellar/jpeg-xl/0.11.0/lib
-          DEP_BROTLI_LIB: /opt/homebrew/Cellar/brotli/1.1.0/lib
-          DEP_HWY_LIB: /opt/homebrew/Cellar/highway/1.2.0/lib
+          DEP_JXL_LIB: ${{ env.DEP_JXL_LIB }}
+          DEP_BROTLI_LIB: ${{ env.DEP_BROTLI_LIB }}
+          DEP_HWY_LIB: ${{ env.DEP_HWY_LIB }}
         with:
           target: ${{ matrix.platform.target }}
           args: --release --out dist --find-interpreter --features dynamic

.github/workflows/test.yml

@@ -1,6 +1,14 @@
 name: Test Python
 
-on: [push, pull_request]
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 env:
   RUSTFLAGS: -C debuginfo=0  # Do not produce debug symbols to keep memory usage down
@@ -41,9 +49,10 @@ jobs:
       - name: Install Plugin
         run: |
           brew install jpeg-xl
-          export DEP_JXL_LIB=/opt/homebrew/Cellar/jpeg-xl/0.11.0/lib
-          export DEP_BROTLI_LIB=/opt/homebrew/Cellar/brotli/1.1.0/lib
-          export DEP_HWY_LIB=/opt/homebrew/Cellar/highway/1.2.0/lib
+          export DEP_JXL_LIB=$(brew --prefix jpeg-xl)'/lib'
+          export DEP_BROTLI_LIB=$(brew --prefix brotli)'/lib'
+          export DEP_HWY_LIB=$(brew --prefix highway)'/lib'
+
           source venv/bin/activate
           pip install maturin
           maturin develop --features dynamic

pillow_jxl/JpegXLImagePlugin.py

@@ -8,6 +8,7 @@
 from pillow_jxl import Decoder, Encoder
 
 _VALID_JXL_MODES = {"RGB", "RGBA", "L", "LA"}
+DECODE_THREADS = -1 # -1 detect available cpu cores, 0 disables parallelism
 
 
 def _accept(data):
@@ -26,16 +27,22 @@ class JXLImageFile(ImageFile.ImageFile):
 
     def _open(self):
         self.fc = self.fp.read()
-        self._decoder = Decoder()
+        self._decoder = Decoder(num_threads=DECODE_THREADS)
 
         self.jpeg, self._jxlinfo, self._data, icc_profile = self._decoder(self.fc)
         # FIXME (Isotr0py): Maybe slow down jpeg reconstruction
         if self.jpeg:
             with Image.open(BytesIO(self._data)) as im:
                 self._data = im.tobytes()
-        self._size = (self._jxlinfo.width, self._jxlinfo.height)
-        self.rawmode = self._jxlinfo.mode
-        self.info["icc_profile"] = icc_profile
+                self._size = im.size
+                self.rawmode = im.mode
+                self.info = im.info
+                icc_profile = im.info.get("icc_profile", icc_profile)
+        else:
+            self._size = (self._jxlinfo.width, self._jxlinfo.height)
+            self.rawmode = self._jxlinfo.mode
+        if icc_profile:
+            self.info["icc_profile"] = icc_profile
         # NOTE (Isotr0py): PIL 10.1.0 changed the mode to property, use _mode instead
         if parse(PIL.__version__) >= parse("10.1.0"):
             self._mode = self.rawmode
@@ -98,7 +105,7 @@ def _save(im, fp, filename, save_all=False):
     effort = info.get("effort", 7)
     use_container = info.get("use_container", False)
     use_original_profile = info.get("use_original_profile", False)
-    jpeg_encode = info.get("lossless_jpeg", True)
+    jpeg_encode = info.get("lossless_jpeg", None)
     num_threads = info.get("num_threads", -1)
 
     enc = Encoder(
@@ -113,16 +120,20 @@ def _save(im, fp, filename, save_all=False):
     )
     # FIXME (Isotr0py): im.filename maybe None if parse stream
     # TODO (Isotr0py): This part should be refactored in the near future
-    if im.format == "JPEG" and im.filename and jpeg_encode:
-        warnings.warn(
-            "Using JPEG reconstruction to create lossless JXL image from JPEG. "
-            "This is the default behavior for JPEG encode, if you want to "
-            "disable this, please set 'lossless_jpeg' to False."
-        )
+    if im.format == "JPEG" and im.filename and (jpeg_encode or jpeg_encode is None):
+        if jpeg_encode is None:
+            warnings.warn(
+                "Using JPEG reconstruction to create lossless JXL image from JPEG. "
+                "This is the default behavior for JPEG encode, if you want to "
+                "disable this, please set 'lossless_jpeg'."
+            )
         with open(im.filename, "rb") as f:
             data = enc(f.read(), im.width, im.height, jpeg_encode=True)
     else:
-        exif = info.get("exif", im.getexif().tobytes())
+        exif = info.get("exif")
+        if exif is None:
+            exif = im.getexif()
+            exif = exif.tobytes() if exif else None
         if exif and exif.startswith(b"Exif\x00\x00"):
             exif = exif[6:]
         metadata = {

pillow_jxl/__init__.pyi

@@ -15,7 +15,8 @@ class Encoder:
                  parallel: bool = True,
                  has_alpha: bool = False,
                  lossless: bool = True,
-                 quality: float = 0.0): ...
+                 quality: float = 0.0,
+                 num_threads: int = -1): ...
 
     def __call__(self, data: bytes, width: int, height: int, jpeg_encode: bool) -> bytes: ...
     '''
@@ -37,7 +38,7 @@ class Decoder:
             parallel(`bool`): enable parallel decoding
     '''
 
-    def __init__(self, parallel: bool = True): ...
+    def __init__(self, num_threads: int = -1): ...
 
     def __call__(self, data: bytes) -> (bool, ImageInfo, bytes): ...
     '''

test/test_plugin.py

@@ -58,7 +58,7 @@ def test_encode(image):
 def test_jpeg_encode():
     temp = tempfile.mktemp(suffix=".jxl")
     img_ori = Image.open("test/images/sample.jpg")
-    img_ori.save(temp, lossless=True)
+    img_ori.save(temp, lossless=True, lossless_jpeg=True)
 
     img_enc = Image.open(temp)
     assert img_ori.size == img_enc.size == (40, 50)