src/ src_classic/: fixes to work with latest MuPDF master.

fnptr `fz_document_open_fn` has changed.

Author: julian-smith-artifex-com

src/__init__.py

@@ -2689,14 +2689,24 @@ def __init__(self, filename=None, stream=None, filetype=None, rect=None, width=0
                                     #log( f'{handler.open=}')
                                     #log( f'{dir(handler.open)=}')
                                     try:
-                                        doc = mupdf.ll_fz_document_open_fn_call( handler.open, filename)
+                                        if mupdf_version_tuple >= (1, 24):
+                                            doc = mupdf.ll_fz_document_open_fn_call(
+                                                    handler.open,
+                                                    mupdf.FzStream(filename),
+                                                    mupdf.FzStream(),
+                                                    mupdf.FzArchive(),
+                                                    )
+                                        else:
+                                            doc = mupdf.ll_fz_document_open_fn_call( handler.open, filename)
                                     except Exception as e:
                                         if g_exceptions_verbose > 1:    exception_info()
                                         raise FileDataError( MSG_BAD_DOCUMENT) from e
                                     doc = mupdf.FzDocument( doc)
-                                elif handler.open_with_stream:
-                                    data = mupdf.fz_open_file( filename)
-                                    doc = mupdf.fz_document_open_with_stream_fn_call( handler.open_with_stream, data)
+                                else:
+                                    if mupdf_version_tuple < (1, 24):
+                                        if handler.open_with_stream:
+                                            data = mupdf.fz_open_file( filename)
+                                            doc = mupdf.fz_document_open_with_stream_fn_call( handler.open_with_stream, data)
                             else:
                                 raise ValueError( MSG_BAD_FILETYPE)
                     else:

src/extra.i

@@ -1858,6 +1858,17 @@ static mupdf::FzDocument Document_init(
                 {
                     throw std::runtime_error(MSG_BAD_FILETYPE);
                 }
+                #if FZ_VERSION_MINOR >= 24
+                if (handler->open)
+                {
+                    doc = mupdf::fz_document_open_fn_call(
+                            handler->open,
+                            mupdf::FzStream(filename),
+                            mupdf::FzStream(),
+                            mupdf::FzArchive()
+                            );
+                }
+                #else
                 if (handler->open)
                 {
                     doc = mupdf::FzDocument(mupdf::ll_fz_document_open_fn_call(handler->open, filename));
@@ -1872,6 +1883,7 @@ static mupdf::FzDocument Document_init(
                                 )
                             );
                 }
+                #endif
             }
         }
         else

src_classic/fitz_old.i

@@ -517,12 +517,31 @@ struct Document
                             if (!handler) {
                                 RAISEPY(gctx, MSG_BAD_FILETYPE, PyExc_ValueError);
                             }
+                            #if FZ_VERSION_MINOR >= 24
+                            if (handler->open)
+                            {
+                                fz_stream* filename_stream = fz_open_file(gctx, filename);
+                                fz_try(gctx)
+                                {
+                                    doc = handler->open(gctx, filename_stream, NULL, NULL);
+                                }
+                                fz_always(gctx)
+                                {
+                                    fz_drop_stream(gctx, filename_stream);
+                                }
+                                fz_catch(gctx)
+                                {
+                                    fz_rethrow(gctx);
+                                }
+                            }
+                            #else
                             if (handler->open) {
                                 doc = handler->open(gctx, filename);
                             } else if (handler->open_with_stream) {
                                 data = fz_open_file(gctx, filename);
                                 doc = handler->open_with_stream(gctx, data);
                             }
+                            #endif
                         }
                     } else {
                         pdf_document *pdf = pdf_create_document(gctx);