summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile70
-rw-r--r--Makerules2
-rw-r--r--pdf/COPYING (renamed from mupdf/COPYING)0
-rw-r--r--pdf/cmapdump.c (renamed from mupdf/cmapdump.c)19
-rw-r--r--pdf/fontdump.c (renamed from mupdf/fontdump.c)0
-rwxr-xr-xpdf/glyphdump.py (renamed from mupdf/glyphdump.py)0
-rw-r--r--pdf/glyphlist.txt (renamed from mupdf/glyphlist.txt)0
-rw-r--r--pdf/mupdf.h (renamed from mupdf/mupdf.h)0
-rw-r--r--pdf/pdf_annot.c (renamed from mupdf/pdf_annot.c)0
-rw-r--r--pdf/pdf_build.c (renamed from mupdf/pdf_build.c)0
-rw-r--r--pdf/pdf_cmap.c (renamed from mupdf/pdf_cmap.c)0
-rw-r--r--pdf/pdf_cmap_load.c (renamed from mupdf/pdf_cmap_load.c)0
-rw-r--r--pdf/pdf_cmap_parse.c (renamed from mupdf/pdf_cmap_parse.c)0
-rw-r--r--pdf/pdf_cmap_table.c (renamed from mupdf/pdf_cmap_table.c)0
-rw-r--r--pdf/pdf_colorspace.c (renamed from mupdf/pdf_colorspace.c)0
-rw-r--r--pdf/pdf_crypt.c (renamed from mupdf/pdf_crypt.c)0
-rw-r--r--pdf/pdf_debug.c (renamed from mupdf/pdf_debug.c)0
-rw-r--r--pdf/pdf_font.c (renamed from mupdf/pdf_font.c)0
-rw-r--r--pdf/pdf_fontagl.c (renamed from mupdf/pdf_fontagl.c)0
-rw-r--r--pdf/pdf_fontenc.c (renamed from mupdf/pdf_fontenc.c)0
-rw-r--r--pdf/pdf_fontfile.c (renamed from mupdf/pdf_fontfile.c)0
-rw-r--r--pdf/pdf_fontmtx.c (renamed from mupdf/pdf_fontmtx.c)0
-rw-r--r--pdf/pdf_function.c (renamed from mupdf/pdf_function.c)0
-rw-r--r--pdf/pdf_image.c (renamed from mupdf/pdf_image.c)0
-rw-r--r--pdf/pdf_interpret.c (renamed from mupdf/pdf_interpret.c)0
-rw-r--r--pdf/pdf_lex.c (renamed from mupdf/pdf_lex.c)0
-rw-r--r--pdf/pdf_nametree.c (renamed from mupdf/pdf_nametree.c)0
-rw-r--r--pdf/pdf_outline.c (renamed from mupdf/pdf_outline.c)0
-rw-r--r--pdf/pdf_page.c (renamed from mupdf/pdf_page.c)0
-rw-r--r--pdf/pdf_pagetree.c (renamed from mupdf/pdf_pagetree.c)0
-rw-r--r--pdf/pdf_parse.c (renamed from mupdf/pdf_parse.c)0
-rw-r--r--pdf/pdf_pattern.c (renamed from mupdf/pdf_pattern.c)0
-rw-r--r--pdf/pdf_repair.c (renamed from mupdf/pdf_repair.c)0
-rw-r--r--pdf/pdf_shade.c (renamed from mupdf/pdf_shade.c)0
-rw-r--r--pdf/pdf_store.c (renamed from mupdf/pdf_store.c)0
-rw-r--r--pdf/pdf_stream.c (renamed from mupdf/pdf_stream.c)0
-rw-r--r--pdf/pdf_type3.c (renamed from mupdf/pdf_type3.c)0
-rw-r--r--pdf/pdf_unicode.c (renamed from mupdf/pdf_unicode.c)0
-rw-r--r--pdf/pdf_xobject.c (renamed from mupdf/pdf_xobject.c)0
-rw-r--r--pdf/pdf_xref.c (renamed from mupdf/pdf_xref.c)0
40 files changed, 39 insertions, 52 deletions
diff --git a/Makefile b/Makefile
index 4098e0e3..9bc74db4 100644
--- a/Makefile
+++ b/Makefile
@@ -131,41 +131,41 @@ DRAW_OBJ := $(DRAW_SRC:draw/%.c=$(OBJDIR)/%.o)
DRAW_OBJ := $(DRAW_OBJ:draw/%.s=$(OBJDIR)/%.o)
$(DRAW_OBJ): $(FITZ_HDR)
-MUPDF_HDR := $(FITZ_HDR) mupdf/mupdf.h
+MUPDF_HDR := $(FITZ_HDR) pdf/mupdf.h
MUPDF_SRC := \
- mupdf/pdf_annot.c \
- mupdf/pdf_build.c \
- mupdf/pdf_cmap.c \
- mupdf/pdf_cmap_load.c \
- mupdf/pdf_cmap_parse.c \
- mupdf/pdf_cmap_table.c \
- mupdf/pdf_colorspace.c \
- mupdf/pdf_crypt.c \
- mupdf/pdf_debug.c \
- mupdf/pdf_font.c \
- mupdf/pdf_fontagl.c \
- mupdf/pdf_fontenc.c \
- mupdf/pdf_fontfile.c \
- mupdf/pdf_fontmtx.c \
- mupdf/pdf_function.c \
- mupdf/pdf_image.c \
- mupdf/pdf_interpret.c \
- mupdf/pdf_lex.c \
- mupdf/pdf_nametree.c \
- mupdf/pdf_outline.c \
- mupdf/pdf_page.c \
- mupdf/pdf_pagetree.c \
- mupdf/pdf_parse.c \
- mupdf/pdf_pattern.c \
- mupdf/pdf_repair.c \
- mupdf/pdf_shade.c \
- mupdf/pdf_store.c \
- mupdf/pdf_stream.c \
- mupdf/pdf_type3.c \
- mupdf/pdf_unicode.c \
- mupdf/pdf_xobject.c \
- mupdf/pdf_xref.c
-MUPDF_OBJ := $(MUPDF_SRC:mupdf/%.c=$(OBJDIR)/%.o)
+ pdf/pdf_annot.c \
+ pdf/pdf_build.c \
+ pdf/pdf_cmap.c \
+ pdf/pdf_cmap_load.c \
+ pdf/pdf_cmap_parse.c \
+ pdf/pdf_cmap_table.c \
+ pdf/pdf_colorspace.c \
+ pdf/pdf_crypt.c \
+ pdf/pdf_debug.c \
+ pdf/pdf_font.c \
+ pdf/pdf_fontagl.c \
+ pdf/pdf_fontenc.c \
+ pdf/pdf_fontfile.c \
+ pdf/pdf_fontmtx.c \
+ pdf/pdf_function.c \
+ pdf/pdf_image.c \
+ pdf/pdf_interpret.c \
+ pdf/pdf_lex.c \
+ pdf/pdf_nametree.c \
+ pdf/pdf_outline.c \
+ pdf/pdf_page.c \
+ pdf/pdf_pagetree.c \
+ pdf/pdf_parse.c \
+ pdf/pdf_pattern.c \
+ pdf/pdf_repair.c \
+ pdf/pdf_shade.c \
+ pdf/pdf_store.c \
+ pdf/pdf_stream.c \
+ pdf/pdf_type3.c \
+ pdf/pdf_unicode.c \
+ pdf/pdf_xobject.c \
+ pdf/pdf_xref.c
+MUPDF_OBJ := $(MUPDF_SRC:pdf/%.c=$(OBJDIR)/%.o)
$(MUPDF_OBJ): $(MUPDF_HDR)
MUXPS_HDR := $(FITZ_HDR) xps/muxps.h
@@ -194,7 +194,7 @@ $(OBJDIR)/%.o: draw/%.c
$(CC_CMD)
$(OBJDIR)/%.o: draw/%.s
$(CC_CMD)
-$(OBJDIR)/%.o: mupdf/%.c
+$(OBJDIR)/%.o: pdf/%.c
$(CC_CMD)
$(OBJDIR)/%.o: xps/%.c
$(CC_CMD)
diff --git a/Makerules b/Makerules
index e3e5a987..eaee8f63 100644
--- a/Makerules
+++ b/Makerules
@@ -7,7 +7,7 @@ CC ?=
CFLAGS ?=
LDFLAGS ?=
-CFLAGS += -Ifitz -Imupdf -Ixps -Wall
+CFLAGS += -Ifitz -Ipdf -Ixps -Wall
ifeq "$(build)" "debug"
CFLAGS += -pipe -g
diff --git a/mupdf/COPYING b/pdf/COPYING
index 94a9ed02..94a9ed02 100644
--- a/mupdf/COPYING
+++ b/pdf/COPYING
diff --git a/mupdf/cmapdump.c b/pdf/cmapdump.c
index 1a587ac7..5c39b647 100644
--- a/mupdf/cmapdump.c
+++ b/pdf/cmapdump.c
@@ -13,22 +13,9 @@
#include "../fitz/stm_open.c"
#include "../fitz/stm_read.c"
-#include "../mupdf/pdf_lex.c"
-#include "../mupdf/pdf_cmap.c"
-#include "../mupdf/pdf_cmap_parse.c"
-
-static char *
-flagtoname(int flag)
-{
- switch (flag)
- {
- case PDF_CMAP_SINGLE: return "PDF_CMAP_SINGLE,";
- case PDF_CMAP_RANGE: return "PDF_CMAP_RANGE,";
- case PDF_CMAP_TABLE: return "PDF_CMAP_TABLE,";
- case PDF_CMAP_MULTI: return "PDF_CMAP_MULTI,";
- }
- return "-1,";
-}
+#include "../pdf/pdf_lex.c"
+#include "../pdf/pdf_cmap.c"
+#include "../pdf/pdf_cmap_parse.c"
static void
clean(char *p)
diff --git a/mupdf/fontdump.c b/pdf/fontdump.c
index efda0b01..efda0b01 100644
--- a/mupdf/fontdump.c
+++ b/pdf/fontdump.c
diff --git a/mupdf/glyphdump.py b/pdf/glyphdump.py
index 25b2afcc..25b2afcc 100755
--- a/mupdf/glyphdump.py
+++ b/pdf/glyphdump.py
diff --git a/mupdf/glyphlist.txt b/pdf/glyphlist.txt
index b21e977d..b21e977d 100644
--- a/mupdf/glyphlist.txt
+++ b/pdf/glyphlist.txt
diff --git a/mupdf/mupdf.h b/pdf/mupdf.h
index 4184a59f..4184a59f 100644
--- a/mupdf/mupdf.h
+++ b/pdf/mupdf.h
diff --git a/mupdf/pdf_annot.c b/pdf/pdf_annot.c
index c2c67b62..c2c67b62 100644
--- a/mupdf/pdf_annot.c
+++ b/pdf/pdf_annot.c
diff --git a/mupdf/pdf_build.c b/pdf/pdf_build.c
index 616f1c86..616f1c86 100644
--- a/mupdf/pdf_build.c
+++ b/pdf/pdf_build.c
diff --git a/mupdf/pdf_cmap.c b/pdf/pdf_cmap.c
index aab6bd60..aab6bd60 100644
--- a/mupdf/pdf_cmap.c
+++ b/pdf/pdf_cmap.c
diff --git a/mupdf/pdf_cmap_load.c b/pdf/pdf_cmap_load.c
index eae52d8d..eae52d8d 100644
--- a/mupdf/pdf_cmap_load.c
+++ b/pdf/pdf_cmap_load.c
diff --git a/mupdf/pdf_cmap_parse.c b/pdf/pdf_cmap_parse.c
index d899af0e..d899af0e 100644
--- a/mupdf/pdf_cmap_parse.c
+++ b/pdf/pdf_cmap_parse.c
diff --git a/mupdf/pdf_cmap_table.c b/pdf/pdf_cmap_table.c
index a1f61365..a1f61365 100644
--- a/mupdf/pdf_cmap_table.c
+++ b/pdf/pdf_cmap_table.c
diff --git a/mupdf/pdf_colorspace.c b/pdf/pdf_colorspace.c
index 6203e1bb..6203e1bb 100644
--- a/mupdf/pdf_colorspace.c
+++ b/pdf/pdf_colorspace.c
diff --git a/mupdf/pdf_crypt.c b/pdf/pdf_crypt.c
index 6266e188..6266e188 100644
--- a/mupdf/pdf_crypt.c
+++ b/pdf/pdf_crypt.c
diff --git a/mupdf/pdf_debug.c b/pdf/pdf_debug.c
index 9d7f1f56..9d7f1f56 100644
--- a/mupdf/pdf_debug.c
+++ b/pdf/pdf_debug.c
diff --git a/mupdf/pdf_font.c b/pdf/pdf_font.c
index 75bc141f..75bc141f 100644
--- a/mupdf/pdf_font.c
+++ b/pdf/pdf_font.c
diff --git a/mupdf/pdf_fontagl.c b/pdf/pdf_fontagl.c
index e310848b..e310848b 100644
--- a/mupdf/pdf_fontagl.c
+++ b/pdf/pdf_fontagl.c
diff --git a/mupdf/pdf_fontenc.c b/pdf/pdf_fontenc.c
index 0f72cb6a..0f72cb6a 100644
--- a/mupdf/pdf_fontenc.c
+++ b/pdf/pdf_fontenc.c
diff --git a/mupdf/pdf_fontfile.c b/pdf/pdf_fontfile.c
index c164033e..c164033e 100644
--- a/mupdf/pdf_fontfile.c
+++ b/pdf/pdf_fontfile.c
diff --git a/mupdf/pdf_fontmtx.c b/pdf/pdf_fontmtx.c
index e957125a..e957125a 100644
--- a/mupdf/pdf_fontmtx.c
+++ b/pdf/pdf_fontmtx.c
diff --git a/mupdf/pdf_function.c b/pdf/pdf_function.c
index 3fdd6ac7..3fdd6ac7 100644
--- a/mupdf/pdf_function.c
+++ b/pdf/pdf_function.c
diff --git a/mupdf/pdf_image.c b/pdf/pdf_image.c
index b37c7257..b37c7257 100644
--- a/mupdf/pdf_image.c
+++ b/pdf/pdf_image.c
diff --git a/mupdf/pdf_interpret.c b/pdf/pdf_interpret.c
index dbeeb997..dbeeb997 100644
--- a/mupdf/pdf_interpret.c
+++ b/pdf/pdf_interpret.c
diff --git a/mupdf/pdf_lex.c b/pdf/pdf_lex.c
index 6b2f26e4..6b2f26e4 100644
--- a/mupdf/pdf_lex.c
+++ b/pdf/pdf_lex.c
diff --git a/mupdf/pdf_nametree.c b/pdf/pdf_nametree.c
index 6b2314cd..6b2314cd 100644
--- a/mupdf/pdf_nametree.c
+++ b/pdf/pdf_nametree.c
diff --git a/mupdf/pdf_outline.c b/pdf/pdf_outline.c
index b211060f..b211060f 100644
--- a/mupdf/pdf_outline.c
+++ b/pdf/pdf_outline.c
diff --git a/mupdf/pdf_page.c b/pdf/pdf_page.c
index 869f7a5c..869f7a5c 100644
--- a/mupdf/pdf_page.c
+++ b/pdf/pdf_page.c
diff --git a/mupdf/pdf_pagetree.c b/pdf/pdf_pagetree.c
index df3c8b8a..df3c8b8a 100644
--- a/mupdf/pdf_pagetree.c
+++ b/pdf/pdf_pagetree.c
diff --git a/mupdf/pdf_parse.c b/pdf/pdf_parse.c
index b32f4d01..b32f4d01 100644
--- a/mupdf/pdf_parse.c
+++ b/pdf/pdf_parse.c
diff --git a/mupdf/pdf_pattern.c b/pdf/pdf_pattern.c
index 7d3a38d1..7d3a38d1 100644
--- a/mupdf/pdf_pattern.c
+++ b/pdf/pdf_pattern.c
diff --git a/mupdf/pdf_repair.c b/pdf/pdf_repair.c
index 436f7303..436f7303 100644
--- a/mupdf/pdf_repair.c
+++ b/pdf/pdf_repair.c
diff --git a/mupdf/pdf_shade.c b/pdf/pdf_shade.c
index 1b301724..1b301724 100644
--- a/mupdf/pdf_shade.c
+++ b/pdf/pdf_shade.c
diff --git a/mupdf/pdf_store.c b/pdf/pdf_store.c
index d6be2088..d6be2088 100644
--- a/mupdf/pdf_store.c
+++ b/pdf/pdf_store.c
diff --git a/mupdf/pdf_stream.c b/pdf/pdf_stream.c
index cae95a89..cae95a89 100644
--- a/mupdf/pdf_stream.c
+++ b/pdf/pdf_stream.c
diff --git a/mupdf/pdf_type3.c b/pdf/pdf_type3.c
index 9cc15596..9cc15596 100644
--- a/mupdf/pdf_type3.c
+++ b/pdf/pdf_type3.c
diff --git a/mupdf/pdf_unicode.c b/pdf/pdf_unicode.c
index 6c2d6372..6c2d6372 100644
--- a/mupdf/pdf_unicode.c
+++ b/pdf/pdf_unicode.c
diff --git a/mupdf/pdf_xobject.c b/pdf/pdf_xobject.c
index 44389efc..44389efc 100644
--- a/mupdf/pdf_xobject.c
+++ b/pdf/pdf_xobject.c
diff --git a/mupdf/pdf_xref.c b/pdf/pdf_xref.c
index 2e98c97e..2e98c97e 100644
--- a/mupdf/pdf_xref.c
+++ b/pdf/pdf_xref.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-04 16:51:09 +0000