From 1b049ab4a83cfa94bb45c02a70de0bd2adbf8ec8 Mon Sep 17 00:00:00 2001 From: olokelo Date: Tue, 19 Mar 2024 19:22:37 +0100 Subject: [PATCH] minor plugin code tweaks --- src/PIL/JxlImagePlugin.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/PIL/JxlImagePlugin.py b/src/PIL/JxlImagePlugin.py index b4304e9f0..873cc1160 100644 --- a/src/PIL/JxlImagePlugin.py +++ b/src/PIL/JxlImagePlugin.py @@ -48,28 +48,26 @@ class JxlImageFile(ImageFile.ImageFile): self.info["loop"] = n_loops self.is_animated = has_anim - self.n_frames = None self._tps_dur_secs = 1 - if not self.is_animated: - self.n_frames = 1 - elif n_frames > 0: - self.n_frames = n_frames - self._tps_dur_secs = tps_num / tps_denom - # TODO: handle libjxl timecods + self.n_frames = 1 + if self.is_animated: + self.n_frames = None + if n_frames > 0: + self.n_frames = n_frames + self._tps_dur_secs = tps_num / tps_denom + + # TODO: handle libjxl time codes self.__timestamp = 0 self._mode = mode self.rawmode = mode self.tile = [] - icc = self._decoder.get_icc() - exif = self._decoder.get_exif() - xmp = self._decoder.get_xmp() - if icc: + if icc := self._decoder.get_icc(): self.info["icc_profile"] = icc - if exif: + if exif := self._decoder.get_exif(): self.info["exif"] = self._fix_exif(exif) - if xmp: + if xmp := self._decoder.get_xmp(): self.info["xmp"] = xmp self._rewind()