diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/fitz.h | 12 | ||||
| -rw-r--r-- | include/fitz/tree.h | 6 | ||||
| -rw-r--r-- | include/mupdf/base14.h | 60 | ||||
| -rw-r--r-- | include/stream/crypt.h (renamed from include/fitz/crypt.h) | 0 | ||||
| -rw-r--r-- | include/stream/file.h (renamed from include/fitz/file.h) | 0 | ||||
| -rw-r--r-- | include/stream/filter.h (renamed from include/fitz/filter.h) | 0 | ||||
| -rw-r--r-- | include/stream/object.h (renamed from include/fitz/object.h) | 0 |
7 files changed, 38 insertions, 40 deletions
diff --git a/include/fitz.h b/include/fitz.h index 4c9756a0..5db0fe0d 100644 --- a/include/fitz.h +++ b/include/fitz.h @@ -5,17 +5,10 @@ #include "fitz/sysdep.h" #include "fitz/cpudep.h" - #include "fitz/base.h" #include "fitz/math.h" #include "fitz/geometry.h" #include "fitz/hash.h" -#include "fitz/crypt.h" - -#include "fitz/object.h" - -#include "fitz/filter.h" -#include "fitz/file.h" #include "fitz/cmap.h" #include "fitz/font.h" @@ -32,3 +25,8 @@ #include "fitz/pathscan.h" #include "fitz/render.h" +#include "stream/crypt.h" +#include "stream/object.h" +#include "stream/filter.h" +#include "stream/file.h" + diff --git a/include/fitz/tree.h b/include/fitz/tree.h index 15e4bcf1..ced3b491 100644 --- a/include/fitz/tree.h +++ b/include/fitz/tree.h @@ -128,8 +128,8 @@ struct fz_linknode_s struct fz_metanode_s { fz_node super; - fz_obj *name; - fz_obj *dict; + void *name; + void *dict; }; struct fz_imagenode_s @@ -150,7 +150,7 @@ fz_rect fz_boundnode(fz_node *node, fz_matrix ctm); void fz_dropnode(fz_node *node); /* branch nodes */ -fz_error *fz_newmetanode(fz_node **nodep, fz_obj *name, fz_obj *dict); +fz_error *fz_newmetanode(fz_node **nodep, void *name, void *dict); fz_error *fz_newovernode(fz_node **nodep); fz_error *fz_newmasknode(fz_node **nodep); fz_error *fz_newblendnode(fz_node **nodep, fz_colorspace *cs, fz_blendkind b, int k, int i); diff --git a/include/mupdf/base14.h b/include/mupdf/base14.h index 1630d4dd..f1668d53 100644 --- a/include/mupdf/base14.h +++ b/include/mupdf/base14.h @@ -1,30 +1,30 @@ -extern unsigned char Dingbats_cff[]; -extern unsigned int Dingbats_cff_len; -extern unsigned char NimbusMonL_Bold_cff[]; -extern unsigned int NimbusMonL_Bold_cff_len; -extern unsigned char NimbusMonL_BoldObli_cff[]; -extern unsigned int NimbusMonL_BoldObli_cff_len; -extern unsigned char NimbusMonL_Regu_cff[]; -extern unsigned int NimbusMonL_Regu_cff_len; -extern unsigned char NimbusMonL_ReguObli_cff[]; -extern unsigned int NimbusMonL_ReguObli_cff_len; -extern unsigned char NimbusRomNo9L_Medi_cff[]; -extern unsigned int NimbusRomNo9L_Medi_cff_len; -extern unsigned char NimbusRomNo9L_MediItal_cff[]; -extern unsigned int NimbusRomNo9L_MediItal_cff_len; -extern unsigned char NimbusRomNo9L_Regu_cff[]; -extern unsigned int NimbusRomNo9L_Regu_cff_len; -extern unsigned char NimbusRomNo9L_ReguItal_cff[]; -extern unsigned int NimbusRomNo9L_ReguItal_cff_len; -extern unsigned char NimbusSanL_Bold_cff[]; -extern unsigned int NimbusSanL_Bold_cff_len; -extern unsigned char NimbusSanL_BoldItal_cff[]; -extern unsigned int NimbusSanL_BoldItal_cff_len; -extern unsigned char NimbusSanL_Regu_cff[]; -extern unsigned int NimbusSanL_Regu_cff_len; -extern unsigned char NimbusSanL_ReguItal_cff[]; -extern unsigned int NimbusSanL_ReguItal_cff_len; -extern unsigned char StandardSymL_cff[]; -extern unsigned int StandardSymL_cff_len; -extern unsigned char URWChanceryL_MediItal_cff[]; -extern unsigned int URWChanceryL_MediItal_cff_len; +extern unsigned char fonts_Dingbats_cff[]; +extern unsigned int fonts_Dingbats_cff_len; +extern unsigned char fonts_NimbusMonL_Bold_cff[]; +extern unsigned int fonts_NimbusMonL_Bold_cff_len; +extern unsigned char fonts_NimbusMonL_BoldObli_cff[]; +extern unsigned int fonts_NimbusMonL_BoldObli_cff_len; +extern unsigned char fonts_NimbusMonL_Regu_cff[]; +extern unsigned int fonts_NimbusMonL_Regu_cff_len; +extern unsigned char fonts_NimbusMonL_ReguObli_cff[]; +extern unsigned int fonts_NimbusMonL_ReguObli_cff_len; +extern unsigned char fonts_NimbusRomNo9L_Medi_cff[]; +extern unsigned int fonts_NimbusRomNo9L_Medi_cff_len; +extern unsigned char fonts_NimbusRomNo9L_MediItal_cff[]; +extern unsigned int fonts_NimbusRomNo9L_MediItal_cff_len; +extern unsigned char fonts_NimbusRomNo9L_Regu_cff[]; +extern unsigned int fonts_NimbusRomNo9L_Regu_cff_len; +extern unsigned char fonts_NimbusRomNo9L_ReguItal_cff[]; +extern unsigned int fonts_NimbusRomNo9L_ReguItal_cff_len; +extern unsigned char fonts_NimbusSanL_Bold_cff[]; +extern unsigned int fonts_NimbusSanL_Bold_cff_len; +extern unsigned char fonts_NimbusSanL_BoldItal_cff[]; +extern unsigned int fonts_NimbusSanL_BoldItal_cff_len; +extern unsigned char fonts_NimbusSanL_Regu_cff[]; +extern unsigned int fonts_NimbusSanL_Regu_cff_len; +extern unsigned char fonts_NimbusSanL_ReguItal_cff[]; +extern unsigned int fonts_NimbusSanL_ReguItal_cff_len; +extern unsigned char fonts_StandardSymL_cff[]; +extern unsigned int fonts_StandardSymL_cff_len; +extern unsigned char fonts_URWChanceryL_MediItal_cff[]; +extern unsigned int fonts_URWChanceryL_MediItal_cff_len; diff --git a/include/fitz/crypt.h b/include/stream/crypt.h index 647a1eda..647a1eda 100644 --- a/include/fitz/crypt.h +++ b/include/stream/crypt.h diff --git a/include/fitz/file.h b/include/stream/file.h index c87ccf5d..c87ccf5d 100644 --- a/include/fitz/file.h +++ b/include/stream/file.h diff --git a/include/fitz/filter.h b/include/stream/filter.h index bb33b8eb..bb33b8eb 100644 --- a/include/fitz/filter.h +++ b/include/stream/filter.h diff --git a/include/fitz/object.h b/include/stream/object.h index 34b62f59..34b62f59 100644 --- a/include/fitz/object.h +++ b/include/stream/object.h |