Merge branch 'main' into load-from-memview

Author: JorjMcKie

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -47,6 +47,7 @@ body:
       label: PyMuPDF version
       options:
         - 
+        - 1.25.3
         - 1.25.2
         - 1.25.1
         - 1.25.0

.github/workflows/build_wheels.yml

@@ -72,8 +72,9 @@ jobs:
       run:
         python scripts/gh_release.py
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
+        name: sdist-${{ matrix.os }}
         path: dist/*.tar.gz    
 
 
@@ -155,6 +156,7 @@ jobs:
 
       # Upload generated wheels, to be accessible from github Actions page.
       #
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl

.readthedocs.yaml

@@ -20,8 +20,7 @@ sphinx:
    configuration: docs/conf.py
 
 # If using Sphinx, optionally build your docs in additional formats such as PDF
-formats:
-   - pdf
+formats: all
 
 # Optionally declare the Python requirements required to build your docs
 python:

changes.txt

@@ -2,7 +2,7 @@ Change Log
 ==========
 
 
-**Changes in version 1.25.3 ()**
+**Changes in version 1.25.3 (2025-02-06)**
 
 * Use MuPDF-1.25.4.
 

docs/recipes-annotations.rst

@@ -57,19 +57,6 @@ The result looks like this:
 
 
 
-
-Using Buttons and JavaScript
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Since MuPDF v1.16, 'FreeText' annotations no longer support bold or italic versions of the Times-Roman, Helvetica or Courier fonts.
-
-A big **thank you** to our user `@kurokawaikki <https://github.com/kurokawaikki>`_, who contributed the following script to **circumvent this restriction**.
-
-.. literalinclude:: samples/make-bold.py
-   :language: python
-
---------------------------
-
-
 .. _RecipesAnnotations_C:
 
 How to Use Ink Annotations

docs/recipes-multiprocessing.rst

@@ -16,11 +16,7 @@
 Multiprocessing
 ==============================
 
-:title:`MuPDF` has no integrated support for threading - calling itself "thread-agnostic". While there do exist tricky possibilities to still use threading with :title:`MuPDF`, the baseline consequence for |PyMuPDF| is:
-
-**No Python threading support**.
-
-Using |PyMuPDF| in a :title:`Python` threading environment will lead to blocking effects for the main thread.
+|PyMuPDF| does not support running on multiple threads - doing so may cause incorrect behaviour or even crash Python itself.
 
 However, there is the option to use :title:`Python's` *multiprocessing* module in a variety of ways.
 

docs/samples/make-bold.py

@@ -1,6 +1,6 @@
 ----
 
-This documentation covers **PyMuPDF v1.25.2** features as of **2025-01-17 00:00:01**.
+This documentation covers **PyMuPDF v1.25.3** features as of **2025-02-06 00:00:01**.
 
 The major and minor versions of **PyMuPDF** and **MuPDF** will always be the same. Only the third qualifier (patch level) may deviate from that of **MuPDF**.
 

docs/version.rst

@@ -373,9 +373,9 @@ def _int_rc(text):
 
 # Basic version information.
 #
-pymupdf_version = "1.25.2"
+pymupdf_version = "1.25.3"
 mupdf_version = mupdf.FZ_VERSION
-pymupdf_date = "2025-01-17 00:00:01"
+pymupdf_date = "2025-02-06 00:00:01"
 
 # Versions as tuples; useful when comparing versions.
 #
@@ -9870,10 +9870,9 @@ def __init__(self, *args):
 
             # copy samples data ------------------------------------------
             if 1:
-                # We use specially-provided (by MuPDF Python bindings)
-                # ll_fz_pixmap_copy() to get best performance.
+                # We use our pixmap_copy() to get best performance.
                 # test_pixmap.py:test_setalpha(): 3.9s t=0.0062
-                mupdf.ll_fz_pixmap_copy( pm.m_internal, src_pix.m_internal, n)
+                extra.pixmap_copy( pm.m_internal, src_pix.m_internal, n)
             elif 1:
                 # Use memoryview.
                 # test_pixmap.py:test_setalpha(): 4.6 t=0.51

src/__init__.py

@@ -4039,6 +4039,58 @@ no_more_matches:;
     return quads;
 }
 
+void pixmap_copy( fz_pixmap* pm, const fz_pixmap* src, int n)
+{
+    assert(pm->w == src->w);
+    assert(pm->h == src->h);
+    assert(n <= pm->n);
+    assert(n <= src->n);
+
+    if (pm->n == src->n)
+    {
+        // identical samples
+        assert(pm->stride == src->stride);
+        memcpy(pm->samples, src->samples, pm->w * pm->h * pm->n);
+    }
+    else
+    {
+        int nn;
+        int do_alpha;
+        if (pm->n > src->n)
+        {
+            assert(pm->n == src->n + 1);
+            nn = src->n;
+            assert(!src->alpha);
+            assert(pm->alpha);
+            do_alpha = 1;
+        }
+        else
+        {
+            assert(src->n == pm->n + 1);
+            nn = pm->n;
+            assert(src->alpha);
+            assert(!pm->alpha);
+            do_alpha = 0;
+        }
+        for (int y=0; y<pm->h; ++y)
+        {
+            for (int x=0; x<pm->w; ++x)
+            {
+                memcpy(
+                        pm->samples + pm->stride * y + pm->n * x,
+                        src->samples + src->stride * y + src->n * x,
+                        nn
+                        );
+                if (do_alpha)
+                {
+                    pm->samples[pm->stride * y + pm->n * x + pm->n-1] = 255;
+                }
+            }
+        }
+    }
+}
+
+
 %}
 
 /* Declarations for functions defined above. */
@@ -4162,3 +4214,9 @@ int pixmap_n(mupdf::FzPixmap& pixmap);
 PyObject* JM_search_stext_page(fz_stext_page *page, const char *needle);
 
 PyObject *set_pixel(fz_pixmap* pm, int x, int y, PyObject *color);
+
+/* Copies from <src> to <pm>, which must have same width and height. pm->n -
+src->n must be -1, 0 or +1. If -1, <src> must have alpha and <pm> must not have
+alpha, and we copy the non-alpha bytes. If +1 <src> must not have alpha and
+<pm> must have alpha and we set <pm>'s alpha bytes all to 255.*/
+void pixmap_copy(fz_pixmap* pm, const fz_pixmap* src, int n);