PyMuPDF 1.23.13__tar.gz → 1.23.14__tar.gz

{PyMuPDF-1.23.13 → PyMuPDF-1.23.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyMuPDF
-Version: 1.23.13
+Version: 1.23.14
 Summary: A high performance Python library for data extraction, analysis, conversion & manipulation of PDF (and other) documents.
 Description-Content-Type: text/markdown
 Author: Artifex

{PyMuPDF-1.23.13 → PyMuPDF-1.23.14}/changes.txt

@@ -2,6 +2,18 @@ Change Log
 ==========
 
 
+**Changes in version 1.23.14 (2024-01-15)**
+
+* Bug fixes:
+
+  * **Fixed** `3038 <https://github.com/pymupdf/PyMuPDF/issues/3038>`_: JM_pixmap_from_display_list > Assertion Error : Checking for wrong type
+  * **Fixed** `3039 <https://github.com/pymupdf/PyMuPDF/issues/3039>`_: Issue with doc.close() not closing the document in PyMuPDF
+
+* Other:
+
+  * Ensure valid "re" rectangles in `Page.get_drawings()` with derotated pages.
+
+
 **Changes in version 1.23.13 (2024-01-15)**
 
 * Bug fixes:

{PyMuPDF-1.23.13 → PyMuPDF-1.23.14}/setup.py

@@ -1072,7 +1072,7 @@ with open( f'{g_root}/READMErb.md', encoding='utf-8') as f:
 # We generate different wheels depending on g_flavour.
 #
 
-version = '1.23.13'
+version = '1.23.14'
 version_b = '1.23.9'
 
 tag_python = None

{PyMuPDF-1.23.13 → PyMuPDF-1.23.14}/src/__init__.py

@@ -2460,7 +2460,9 @@ class DisplayList:
             assert 0, f'Unrecognised {args=}'
 
     def get_pixmap(self, matrix=None, colorspace=None, alpha=0, clip=None):
-        if not colorspace:
+        if isinstance(colorspace, Colorspace):
+            colorspace = colorspace.this
+        else:
             colorspace = mupdf.FzColorspace(mupdf.FzColorspace.Fixed_RGB)
         val = JM_pixmap_from_display_list(self.this, matrix, colorspace, alpha, clip, None)
         val.thisown = True
@@ -3558,16 +3560,12 @@ class Document:
         #self._reset_page_refs()
         #self.metadata    = None
         #self.stream      = None
-        #self.is_closed    = True
+        self.is_closed    = True
         #self.FontInfos   = []
         #self.Graftmaps = {}
         #self.ShownPages = {}
         #self.InsertedImages  = {}
-        
         #self.this = None
-        self.close_internal()
-
-    def close_internal(self):
         self.this = None
 
     def convert_to_pdf(self, from_page=0, to_page=-1, rotate=0):
@@ -8673,7 +8671,7 @@ class Page:
                     cmd = item[0]
                     rest = item[1:]
                     if  cmd == "re":
-                        item = ("re", Rect(rest[0]), rest[1])
+                        item = ("re", Rect(rest[0]).normalize(), rest[1])
                     elif cmd == "qu":
                         item = ("qu", Quad(rest[0]))
                     else:
@@ -8807,7 +8805,7 @@ class Page:
                         cmd = item[0]
                         rest = item[1:]
                         if  cmd == "re":
-                            item = ("re", Rect(rest[0]), rest[1])
+                            item = ("re", Rect(rest[0]).normalize(), rest[1])
                         elif cmd == "qu":
                             item = ("qu", Quad(rest[0]))
                         else:
@@ -16792,8 +16790,9 @@ def JM_pixmap_from_display_list(
     rect = mupdf.fz_transform_rect(rect, matrix)
     irect = mupdf.fz_round_rect(rect)
 
-    assert isinstance( cs, Colorspace)
-    pix = mupdf.fz_new_pixmap_with_bbox(cs.this, irect, seps, alpha)
+    assert isinstance( cs, mupdf.FzColorspace)
+
+    pix = mupdf.fz_new_pixmap_with_bbox(cs, irect, seps, alpha)
     if alpha:
         mupdf.fz_clear_pixmap(pix)
     else:
@@ -21740,7 +21739,7 @@ def int_rc(text):
     return int(text)
 
 VersionFitz = "1.23.9" # MuPDF version.
-VersionBind = "1.23.13" # PyMuPDF version.
+VersionBind = "1.23.14" # PyMuPDF version.
 VersionDate = "2024-01-15 00:00:01"
 VersionDate2 = VersionDate.replace('-', '').replace(' ', '').replace(':', '')
 version = (VersionBind, VersionFitz, VersionDate2)

{PyMuPDF-1.23.13 → PyMuPDF-1.23.14}/src_classic/fitz_old.i

@@ -6344,7 +6344,7 @@ def get_oc_items(self) -> list:
                         cmd = item[0]
                         rest = item[1:]
                         if  cmd == "re":
-                            item = ("re", Rect(rest[0]), rest[1])
+                            item = ("re", Rect(rest[0]).normalize(), rest[1])
                         elif cmd == "qu":
                             item = ("qu", Quad(rest[0]))
                         else:
@@ -6479,7 +6479,7 @@ def get_oc_items(self) -> list:
                         cmd = item[0]
                         rest = item[1:]
                         if  cmd == "re":
-                            item = ("re", Rect(rest[0]), rest[1])
+                            item = ("re", Rect(rest[0]).normalize(), rest[1])
                         elif cmd == "qu":
                             item = ("qu", Quad(rest[0]))
                         else:

{PyMuPDF-1.23.13 → PyMuPDF-1.23.14}/src_classic/version.i

@@ -1,6 +1,6 @@
 %pythoncode %{
 VersionFitz = "1.23.9" # MuPDF version.
-VersionBind = "1.23.13" # PyMuPDF version.
+VersionBind = "1.23.14" # PyMuPDF version.
 VersionDate = "2024-01-15 00:00:01"
 version = (VersionBind, VersionFitz, "20240115000001")
 pymupdf_version_tuple = tuple( [int(i) for i in VersionFitz.split('.')])

{PyMuPDF-1.23.13 → PyMuPDF-1.23.14}/tests/test_general.py

@@ -153,6 +153,7 @@ def test_bug1971():
         page = next(doc.pages())
         page.get_drawings()
         doc.close()
+        assert doc.is_closed
 
 def test_default_font():
     f = fitz.Font()
@@ -539,6 +540,12 @@ def test_2692():
                 alpha=False,
                 clip=fitz.Rect(0,0,10,10),
                 )
+        pix = dl.get_pixmap(
+                matrix=fitz.Identity,
+                #colorspace=fitz.csRGB,
+                alpha=False,
+                clip=fitz.Rect(0,0,10,10),
+                )
     
 
 def test_2596():