! Update to MuPDF 1.24.1

wmjordan · Apr 20, 2024 · 6fce27f · 6fce27f
1 parent 428ddbe
commit 6fce27f
Show file tree

Hide file tree

Showing 5 changed files with 204 additions and 11 deletions.
diff --git a/Demo/Program.cs b/Demo/Program.cs
@@ -114,7 +114,7 @@ static class NativeMethods
 			const uint FZ_STORE_DEFAULT = 256 << 20;
 			const string DLL = "MuPDFLib.dll";
 			// note: modify the version number to match the FZ_VERSION definition in "include\fitz\version.h" file
-			const string FZ_VERSION = "1.23.11";
+			const string FZ_VERSION = "1.24.1";
 
 			[DllImport(DLL, CallingConvention = CC.Cdecl, EntryPoint = "fz_new_context_imp", BestFitMapping = false)]
 			static extern IntPtr NewContext(IntPtr alloc, IntPtr locks, uint max_store, [MarshalAs(UnmanagedType.LPStr)] string fz_version);

diff --git a/MuPDF.sln b/MuPDF.sln
@@ -33,6 +33,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{D9FFEF20-8
 		readme.md = readme.md
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libharfbuzz", "mupdf\platform\win32\libharfbuzz.vcxproj", "{66778899-0291-4FB9-8D96-D58957CA5E3C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -830,6 +832,78 @@ Global
 		{CA0BDA38-89B9-4703-A77D-8049AC3A0D04}.ReleaseTesseract|x64.Build.0 = Release|x64
 		{CA0BDA38-89B9-4703-A77D-8049AC3A0D04}.ReleaseTesseract|x86.ActiveCfg = Release|Win32
 		{CA0BDA38-89B9-4703-A77D-8049AC3A0D04}.ReleaseTesseract|x86.Build.0 = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x64.ActiveCfg = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x64.Build.0 = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x86.ActiveCfg = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Debug|x86.Build.0 = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x64.ActiveCfg = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x64.Build.0 = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x86.ActiveCfg = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugCommercial|x86.Build.0 = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x64.ActiveCfg = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x64.Build.0 = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x86.ActiveCfg = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugExtract|x86.Build.0 = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x64.ActiveCfg = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x64.Build.0 = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x86.ActiveCfg = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugJava|x86.Build.0 = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x64.ActiveCfg = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x64.Build.0 = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x86.ActiveCfg = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugOpenSSL|x86.Build.0 = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x64.ActiveCfg = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x64.Build.0 = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x86.ActiveCfg = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.DebugTesseract|x86.Build.0 = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x64.ActiveCfg = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x64.Build.0 = Debug|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x86.ActiveCfg = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Disabled|x86.Build.0 = Debug|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x64.ActiveCfg = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x64.Build.0 = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x86.ActiveCfg = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Memento|x86.Build.0 = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x64.ActiveCfg = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x64.Build.0 = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x86.ActiveCfg = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoCommercial|x86.Build.0 = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x64.ActiveCfg = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x64.Build.0 = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x86.ActiveCfg = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoExtract|x86.Build.0 = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x64.ActiveCfg = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x64.Build.0 = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x86.ActiveCfg = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoOpenSSL|x86.Build.0 = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x64.ActiveCfg = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x64.Build.0 = Memento|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x86.ActiveCfg = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.MementoTesseract|x86.Build.0 = Memento|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x64.ActiveCfg = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x64.Build.0 = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x86.ActiveCfg = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.Release|x86.Build.0 = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x64.ActiveCfg = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x64.Build.0 = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x86.ActiveCfg = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseCommercial|x86.Build.0 = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x64.ActiveCfg = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x64.Build.0 = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x86.ActiveCfg = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseExtract|x86.Build.0 = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x64.ActiveCfg = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x64.Build.0 = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x86.ActiveCfg = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseJava|x86.Build.0 = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x64.ActiveCfg = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x64.Build.0 = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x86.ActiveCfg = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenSSL|x86.Build.0 = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x64.ActiveCfg = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x64.Build.0 = Release|x64
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x86.ActiveCfg = Release|Win32
+		{66778899-0291-4FB9-8D96-D58957CA5E3C}.ReleaseTesseract|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/MuPDFLib/gen_libmupdf.def.py b/MuPDFLib/gen_libmupdf.def.py
@@ -61,10 +61,10 @@ def main():
 	doc_exports = collectFunctions("source/fitz/document-all.c") + ["fz_get_annot_type", "fz_log_dump_store","fz_outline_from_iterator"]
 	more_formats = collectFunctions("source/fitz/svg-device.c") + collectFunctions("source/fitz/output-pcl.c") + collectFunctions("source/fitz/output-pwg.c")
 	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"]
-	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"]
+	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"]
 	sign_exports = ["pdf_crypt_buffer", "pdf_read_pfx", "pdf_sign_signature", "pdf_signer_designated_name", "pdf_free_designated_name"]
 	jbig2_exclude = collectFunctions("thirdparty/jbig2dec/jbig2_image_rw.h") + ["jbig2_dump_huffman_binary", "jbig2_dump_huffman_state", "jbig2_arith_has_reached_marker"]
-	tesseract_exclude = ["TessBaseAPIInitLangMod", "TessBaseAPIClearAdaptiveClassifier", "TessBaseAPIAdaptToWordStr"]
+	tesseract_exclude = ["TessBaseAPIInitLangMod", "TessBaseAPIClearAdaptiveClassifier", "TessBaseAPIAdaptToWordStr", "TessBaseAPIDetectOrientationScript"]
 
 	fitz_exports = generateExports("include/mupdf/fitz", doc_exports + more_formats + misc_exports)
 	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"])