Skip to content

Commit 6fce27f

Browse files
wmjordanwmjordan
committed
! Update to MuPDF 1.24.1
1 parent 428ddbe commit 6fce27f

File tree

5 files changed

+204
-11
lines changed

5 files changed

+204
-11
lines changed

‎Demo/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static class NativeMethods
114114
const uint FZ_STORE_DEFAULT = 256 << 20;
115115
const string DLL = "MuPDFLib.dll";
116116
// note: modify the version number to match the FZ_VERSION definition in "include\fitz\version.h" file
117-
const string FZ_VERSION = "1.23.11";
117+
const string FZ_VERSION = "1.24.1";
118118

119119
[DllImport(DLL, CallingConvention = CC.Cdecl, EntryPoint = "fz_new_context_imp", BestFitMapping = false)]
120120
static extern IntPtr NewContext(IntPtr alloc, IntPtr locks, uint max_store, [MarshalAs(UnmanagedType.LPStr)] string fz_version);

‎MuPDF.sln‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{D9FFEF20-8
3333
readme.md = readme.md
3434
EndProjectSection
3535
EndProject
36+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libharfbuzz", "mupdf\platform\win32\libharfbuzz.vcxproj", "{66778899-0291-4FB9-8D96-D58957CA5E3C}"
37+
EndProject
3638
Global
3739
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3840
Debug|x64 = Debug|x64
@@ -830,6 +832,78 @@ Global
830832
{CA0BDA38-89B9-4703-A77D-8049AC3A0D04}.ReleaseTesseract|x64.Build.0 = Release|x64
831833
{CA0BDA38-89B9-4703-A77D-8049AC3A0D04}.ReleaseTesseract|x86.ActiveCfg = Release|Win32
832834
{CA0BDA38-89B9-4703-A77D-8049AC3A0D04}.ReleaseTesseract|x86.Build.0 = Release|Win32
835+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x64.ActiveCfg = Debug|x64
836+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x64.Build.0 = Debug|x64
837+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x86.ActiveCfg = Debug|Win32
838+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x86.Build.0 = Debug|Win32
839+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x64.ActiveCfg = Debug|x64
840+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x64.Build.0 = Debug|x64
841+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x86.ActiveCfg = Debug|Win32
842+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x86.Build.0 = Debug|Win32
843+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x64.ActiveCfg = Debug|x64
844+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x64.Build.0 = Debug|x64
845+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x86.ActiveCfg = Debug|Win32
846+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x86.Build.0 = Debug|Win32
847+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x64.ActiveCfg = Debug|x64
848+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x64.Build.0 = Debug|x64
849+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x86.ActiveCfg = Debug|Win32
850+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x86.Build.0 = Debug|Win32
851+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x64.ActiveCfg = Debug|x64
852+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x64.Build.0 = Debug|x64
853+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x86.ActiveCfg = Debug|Win32
854+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x86.Build.0 = Debug|Win32
855+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x64.ActiveCfg = Debug|x64
856+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x64.Build.0 = Debug|x64
857+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x86.ActiveCfg = Debug|Win32
858+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x86.Build.0 = Debug|Win32
859+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x64.ActiveCfg = Debug|x64
860+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x64.Build.0 = Debug|x64
861+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x86.ActiveCfg = Debug|Win32
862+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x86.Build.0 = Debug|Win32
863+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x64.ActiveCfg = Memento|x64
864+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x64.Build.0 = Memento|x64
865+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x86.ActiveCfg = Memento|Win32
866+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x86.Build.0 = Memento|Win32
867+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x64.ActiveCfg = Memento|x64
868+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x64.Build.0 = Memento|x64
869+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x86.ActiveCfg = Memento|Win32
870+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x86.Build.0 = Memento|Win32
871+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x64.ActiveCfg = Memento|x64
872+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x64.Build.0 = Memento|x64
873+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x86.ActiveCfg = Memento|Win32
874+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x86.Build.0 = Memento|Win32
875+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x64.ActiveCfg = Memento|x64
876+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x64.Build.0 = Memento|x64
877+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x86.ActiveCfg = Memento|Win32
878+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x86.Build.0 = Memento|Win32
879+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x64.ActiveCfg = Memento|x64
880+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x64.Build.0 = Memento|x64
881+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x86.ActiveCfg = Memento|Win32
882+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x86.Build.0 = Memento|Win32
883+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x64.ActiveCfg = Release|x64
884+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x64.Build.0 = Release|x64
885+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x86.ActiveCfg = Release|Win32
886+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x86.Build.0 = Release|Win32
887+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x64.ActiveCfg = Release|x64
888+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x64.Build.0 = Release|x64
889+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x86.ActiveCfg = Release|Win32
890+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x86.Build.0 = Release|Win32
891+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x64.ActiveCfg = Release|x64
892+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x64.Build.0 = Release|x64
893+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x86.ActiveCfg = Release|Win32
894+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x86.Build.0 = Release|Win32
895+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x64.ActiveCfg = Release|x64
896+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x64.Build.0 = Release|x64
897+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x86.ActiveCfg = Release|Win32
898+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x86.Build.0 = Release|Win32
899+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x64.ActiveCfg = Release|x64
900+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x64.Build.0 = Release|x64
901+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x86.ActiveCfg = Release|Win32
902+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x86.Build.0 = Release|Win32
903+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x64.ActiveCfg = Release|x64
904+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x64.Build.0 = Release|x64
905+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x86.ActiveCfg = Release|Win32
906+
{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x86.Build.0 = Release|Win32
833907
EndGlobalSection
834908
GlobalSection(SolutionProperties) = preSolution
835909
HideSolutionNode = FALSE

‎MuPDFLib/gen_libmupdf.def.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ def main():
6161
doc_exports = collectFunctions("source/fitz/document-all.c") + ["fz_get_annot_type", "fz_log_dump_store","fz_outline_from_iterator"]
6262
more_formats = collectFunctions("source/fitz/svg-device.c") + collectFunctions("source/fitz/output-pcl.c") + collectFunctions("source/fitz/output-pwg.c")
6363
form_exports = collectFunctions("source/pdf/pdf-form.c") + collectFunctions("source/pdf/pdf-event.c") + collectFunctions("source/pdf/pdf-appearance.c") + ["pdf_access_submit_event", "pdf_init_ui_pointer_event"]
64-
misc_exports = collectFunctions("source/fitz/test-device.c") + ["fz_set_stderr", "fz_set_stdout", "fz_colorspace_name_process_colorants", "fz_getoptw", "fz_valgrind_pixmap", "fz_stderr", "track_usage", "fz_log_errorFL", "fz_log_error_printfFL", "fz_morph_errorFL", "fz_rethrowFL", "fz_rethrow_ifFL", "fz_throwFL", "fz_vlog_error_printfFL", "fz_vthrowFL", "fz_vwarnFL", "fz_warnFL"]
64+
misc_exports = collectFunctions("source/fitz/test-device.c") + ["fz_set_stderr", "fz_set_stdout", "fz_colorspace_name_process_colorants", "fz_getoptw", "fz_valgrind_pixmap", "fz_stderr", "track_usage", "fz_log_errorFL", "fz_log_error_printfFL", "fz_morph_errorFL", "fz_do_catchFL", "fz_rethrowFL", "fz_rethrow_ifFL", "fz_rethrow_unlessFL", "fz_throwFL", "fz_vlog_error_printfFL", "fz_vthrowFL", "fz_vwarnFL", "fz_warnFL", "HEAP_CAT"]
6565
sign_exports = ["pdf_crypt_buffer", "pdf_read_pfx", "pdf_sign_signature", "pdf_signer_designated_name", "pdf_free_designated_name"]
6666
jbig2_exclude = collectFunctions("thirdparty/jbig2dec/jbig2_image_rw.h") + ["jbig2_dump_huffman_binary", "jbig2_dump_huffman_state", "jbig2_arith_has_reached_marker"]
67-
tesseract_exclude = ["TessBaseAPIInitLangMod", "TessBaseAPIClearAdaptiveClassifier", "TessBaseAPIAdaptToWordStr"]
67+
tesseract_exclude = ["TessBaseAPIInitLangMod", "TessBaseAPIClearAdaptiveClassifier", "TessBaseAPIAdaptToWordStr", "TessBaseAPIDetectOrientationScript"]
6868

6969
fitz_exports = generateExports("include/mupdf/fitz", doc_exports + more_formats + misc_exports)
7070
mupdf_exports = generateExports("include/mupdf/pdf", form_exports + sign_exports + ["pdf_drop_designated_name", "pdf_print_xref", "pdf_recognize", "pdf_resolve_obj", "pdf_open_compressed_stream", "pdf_finish_edit"])

0 commit comments

Comments
 (0)