diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-03-29 22:25:09 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-04-24 16:47:43 +0200 |
| commit | 51b8205a513e86c62121a927a067632c1a933839 (patch) | |
| tree | c2882a6c253a715bfc2ea72854c75350f0b2024b /platform | |
| parent | 67a7449fc1f186f318942b9c6b8d66d4458b7d87 (diff) | |
| download | mupdf-51b8205a513e86c62121a927a067632c1a933839.tar.xz | |
Remove need for namedump by using macros and preprocessor.
Add a PDF_NAME(Foo) macro that evaluates to a pdf_obj for /Foo.
Use the C preprocessor to create the enum values and string table
from one include file instead of using a separate code generator tool.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/java/mupdf_native.c | 2 | ||||
| -rw-r--r-- | platform/win32/generate.bat | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 8d811afe..088782bf 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -9257,7 +9257,7 @@ FUN(PDFAnnotation_updateAppearance)(JNIEnv *env, jobject self) fz_try(ctx) { - pdf_dict_del(ctx, annot->obj, PDF_NAME_AP); /* nuke old AP */ + pdf_dict_del(ctx, annot->obj, PDF_NAME(AP)); /* nuke old AP */ pdf_update_appearance(ctx, annot); pdf_update_annot(ctx, annot); /* ensure new AP is put into annot */ } diff --git a/platform/win32/generate.bat b/platform/win32/generate.bat index ebc619f4..c04dabe6 100644 --- a/platform/win32/generate.bat +++ b/platform/win32/generate.bat @@ -4,13 +4,6 @@ if not exist scripts/hexdump.c cd ../.. if not exist scripts/hexdump.c goto usage if not exist generated mkdir generated -cl /nologo -Iinclude scripts/namedump.c - -if not exist namedump.exe goto usage - -if not exist include/mupdf/pdf/name-table.h namedump.exe resources/pdf/names.txt include/mupdf/pdf/name-table.h source/pdf/pdf-name-table.h -if not exist source/pdf/pdf-name-table.h namedump.exe resources/pdf/names.txt include/mupdf/pdf/name-table.h source/pdf/pdf-name-table.h - cl /nologo -Iinclude scripts/hexdump.c setargv.obj cl /nologo -Iinclude scripts/cmapdump.c setargv.obj @@ -159,8 +152,8 @@ if not exist generated/NotoSerifThai-Regular.c hexdump.exe generated/NotoSerifTh if not exist generated/icc-profiles.c hexdump.exe generated/icc-profiles.c resources/icc/gray.icc resources/icc/rgb.icc resources/icc/cmyk.icc resources/icc/lab.icc -del namedump.obj cmapdump.obj hexdump.obj -del namedump.exe cmapdump.exe hexdump.exe +del cmapdump.obj hexdump.obj +del cmapdump.exe hexdump.exe goto fin |