From 3ef90d6a36f700f93dfdee3f2ce7f5b3fee7d459 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 19 Jan 2026 11:08:36 +0530
Subject: [PATCH] DRYer

---
 src/calibre/ebooks/oeb/polish/check/images.py |  6 ++----
 src/calibre/gui2/library/models.py            | 12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/calibre/ebooks/oeb/polish/check/images.py b/src/calibre/ebooks/oeb/polish/check/images.py
index 641f7c903b..b7364ba7c3 100644
--- a/src/calibre/ebooks/oeb/polish/check/images.py
+++ b/src/calibre/ebooks/oeb/polish/check/images.py
@@ -32,9 +32,8 @@ class CMYKImage(BaseError):
     level = WARN
 
     def __call__(self, container):
-        from qt.core import QImage
-
         from calibre.gui2 import pixmap_to_data
+        from calibre.utils.img import image_from_data
         ext = container.mime_map[self.name].split('/')[-1].upper()
         if ext == 'JPG':
             ext = 'JPEG'
@@ -42,8 +41,7 @@ class CMYKImage(BaseError):
             return False
         with container.open(self.name, 'r+b') as f:
             raw = f.read()
-            i = QImage()
-            i.loadFromData(raw)
+            i = image_from_data(raw)
             if i.isNull():
                 return False
             raw = pixmap_to_data(i, format=ext, quality=95)
diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index cf27fd2ad8..5d6e813bdc 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -47,6 +47,7 @@ from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.config import device_prefs, prefs, tweaks
 from calibre.utils.date import UNDEFINED_DATE, dt_factory, is_date_undefined, qt_from_dt, qt_to_dt
 from calibre.utils.icu import sort_key
+from calibre.utils.img import image_from_data
 from calibre.utils.localization import calibre_langcode_to_name, ngettext
 from calibre.utils.resources import get_path as P
 from calibre.utils.search_query_parser import ParseException, SearchQueryParser
@@ -881,11 +882,8 @@ class BooksModel(QAbstractTableModel):  # {{{
 
         if not data:
             return self.default_image
-        img = QImage()
-        img.loadFromData(data)
-        if img.isNull():
-            img = self.default_image
-        return img
+        img = image_from_data(data)
+        return self.default_image if img.isNull() else img
 
     def build_data_convertors(self):
         rating_fields = {}
@@ -1787,9 +1785,9 @@ class DeviceBooksModel(BooksModel):  # {{{
                 img.load(cdata.image_path)
             elif cdata:
                 if isinstance(cdata, (tuple, list)):
-                    img.loadFromData(cdata[-1])
+                    img = image_from_data(cdata[-1])
                 else:
-                    img.loadFromData(cdata)
+                    img = image_from_data(cdata)
         if img.isNull():
             img = self.default_image
         return img