summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mupdf/pdf/font.h2
-rw-r--r--include/mupdf/pdf/object.h2
-rw-r--r--scripts/namedump.c2
-rw-r--r--source/pdf/pdf-annot.c2
-rw-r--r--source/pdf/pdf-encoding.c2
-rw-r--r--source/pdf/pdf-font.c25
-rw-r--r--source/pdf/pdf-form.c4
-rw-r--r--source/pdf/pdf-layer.c6
-rw-r--r--source/pdf/pdf-object.c4
-rw-r--r--source/pdf/pdf-portfolio.c2
-rw-r--r--source/pdf/pdf-stream.c2
-rw-r--r--source/pdf/pdf-write.c2
-rw-r--r--source/pdf/pdf-xref.c2
-rw-r--r--source/tools/pdfextract.c2
14 files changed, 29 insertions, 30 deletions
diff --git a/include/mupdf/pdf/font.h b/include/mupdf/pdf/font.h
index 63177061..a68aab90 100644
--- a/include/mupdf/pdf/font.h
+++ b/include/mupdf/pdf/font.h
@@ -18,7 +18,7 @@ enum
PDF_FD_FORCE_BOLD = 1 << 18
};
-void pdf_load_encoding(const char **estrings, char *encoding);
+void pdf_load_encoding(const char **estrings, const char *encoding);
int pdf_lookup_agl(const char *name);
const char **pdf_lookup_agl_duplicates(int ucs);
diff --git a/include/mupdf/pdf/object.h b/include/mupdf/pdf/object.h
index 877d6be6..5ceab1f0 100644
--- a/include/mupdf/pdf/object.h
+++ b/include/mupdf/pdf/object.h
@@ -79,7 +79,7 @@ int pdf_to_bool(fz_context *ctx, pdf_obj *obj);
int pdf_to_int(fz_context *ctx, pdf_obj *obj);
fz_off_t pdf_to_offset(fz_context *ctx, pdf_obj *obj);
float pdf_to_real(fz_context *ctx, pdf_obj *obj);
-char *pdf_to_name(fz_context *ctx, pdf_obj *obj);
+const char *pdf_to_name(fz_context *ctx, pdf_obj *obj);
char *pdf_to_str_buf(fz_context *ctx, pdf_obj *obj);
int pdf_to_str_len(fz_context *ctx, pdf_obj *obj);
int pdf_to_num(fz_context *ctx, pdf_obj *obj);
diff --git a/scripts/namedump.c b/scripts/namedump.c
index cfd28e36..46d4d4e3 100644
--- a/scripts/namedump.c
+++ b/scripts/namedump.c
@@ -58,7 +58,7 @@ main(int argc, char **argv)
return EXIT_FAILURE;
}
- fprintf(out_c, "char *PDF_NAMES[] =\n{\n\t\"\",\n");
+ fprintf(out_c, "static const char *PDF_NAMES[] =\n{\n\t\"\",\n");
fprintf(out_h, "enum\n{\n\tPDF_OBJ_ENUM__DUMMY,\n");
diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
index c1a463d9..43436f22 100644
--- a/source/pdf/pdf-annot.c
+++ b/source/pdf/pdf-annot.c
@@ -44,7 +44,7 @@ pdf_parse_link_dest(fz_context *ctx, pdf_document *doc, pdf_obj *dest)
{
pdf_obj *obj;
char buf[256];
- char *ld;
+ const char *ld;
int page;
int x, y;
diff --git a/source/pdf/pdf-encoding.c b/source/pdf/pdf-encoding.c
index ca15b456..ac2f1a55 100644
--- a/source/pdf/pdf-encoding.c
+++ b/source/pdf/pdf-encoding.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
void
-pdf_load_encoding(const char **estrings, char *encoding)
+pdf_load_encoding(const char **estrings, const char *encoding)
{
const char * const *bstrings = NULL;
int i;
diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c
index 037372c1..11349534 100644
--- a/source/pdf/pdf-font.c
+++ b/source/pdf/pdf-font.c
@@ -19,7 +19,8 @@
#define FT_SFNT_HEAD ft_sfnt_head
#endif
-static void pdf_load_font_descriptor(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, pdf_obj *dict, char *collection, char *basefont, int iscidfont);
+static void pdf_load_font_descriptor(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, pdf_obj *dict,
+ const char *collection, const char *basefont, int iscidfont);
static const char *base_font_names[][10] =
{
@@ -340,7 +341,7 @@ static int lookup_mre_code(const char *name)
*/
static void
-pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, int has_descriptor)
+pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, const char *fontname, int has_descriptor)
{
FT_Face face;
const char *clean_name = clean_font_name(fontname);
@@ -368,7 +369,7 @@ pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname,
}
static void
-pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, int mono, int serif, int bold, int italic)
+pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, const char *fontname, int mono, int serif, int bold, int italic)
{
fontdesc->font = fz_load_system_font(ctx, fontname, bold, italic, 0);
if (!fontdesc->font)
@@ -395,7 +396,7 @@ pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontnam
}
static void
-pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, int ros, int serif)
+pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, const char *fontname, int ros, int serif)
{
fontdesc->font = fz_load_system_cjk_font(ctx, fontname, ros, serif);
if (!fontdesc->font)
@@ -417,7 +418,7 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fon
}
static void
-pdf_load_system_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, char *collection)
+pdf_load_system_font(fz_context *ctx, pdf_font_desc *fontdesc, const char *fontname, const char *collection)
{
int bold = 0;
int italic = 0;
@@ -464,7 +465,7 @@ pdf_load_system_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, c
}
static void
-pdf_load_embedded_font(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, char *fontname, pdf_obj *stmref)
+pdf_load_embedded_font(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, const char *fontname, pdf_obj *stmref)
{
fz_buffer *buf;
@@ -617,7 +618,7 @@ select_unknown_cmap(FT_Face face)
}
static pdf_font_desc *
-pdf_load_simple_font_by_name(fz_context *ctx, pdf_document *doc, pdf_obj *dict, char *basefont)
+pdf_load_simple_font_by_name(fz_context *ctx, pdf_document *doc, pdf_obj *dict, const char *basefont)
{
pdf_obj *descriptor;
pdf_obj *encoding;
@@ -930,8 +931,7 @@ pdf_load_simple_font_by_name(fz_context *ctx, pdf_document *doc, pdf_obj *dict,
static pdf_font_desc *
pdf_load_simple_font(fz_context *ctx, pdf_document *doc, pdf_obj *dict)
{
- char *basefont = pdf_to_name(ctx, pdf_dict_get(ctx, dict, PDF_NAME_BaseFont));
-
+ const char *basefont = pdf_to_name(ctx, pdf_dict_get(ctx, dict, PDF_NAME_BaseFont));
return pdf_load_simple_font_by_name(ctx, doc, dict, basefont);
}
@@ -1012,7 +1012,7 @@ load_cid_font(fz_context *ctx, pdf_document *doc, pdf_obj *dict, pdf_obj *encodi
pdf_cmap *cmap;
FT_Face face;
char collection[256];
- char *basefont;
+ const char *basefont;
int i, k, fterr;
pdf_obj *cidtogidmap;
pdf_obj *obj;
@@ -1274,10 +1274,11 @@ pdf_load_type0_font(fz_context *ctx, pdf_document *doc, pdf_obj *dict)
*/
static void
-pdf_load_font_descriptor(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, pdf_obj *dict, char *collection, char *basefont, int iscidfont)
+pdf_load_font_descriptor(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontdesc, pdf_obj *dict,
+ const char *collection, const char *basefont, int iscidfont)
{
pdf_obj *obj1, *obj2, *obj3, *obj;
- char *fontname;
+ const char *fontname;
FT_Face face;
/* Prefer BaseFont; don't bother with FontName */
diff --git a/source/pdf/pdf-form.c b/source/pdf/pdf-form.c
index 1eef8af6..417e74ac 100644
--- a/source/pdf/pdf-form.c
+++ b/source/pdf/pdf-form.c
@@ -884,8 +884,7 @@ int pdf_field_set_value(fz_context *ctx, pdf_document *doc, pdf_obj *field, cons
char *pdf_field_border_style(fz_context *ctx, pdf_document *doc, pdf_obj *field)
{
- char *bs = pdf_to_name(ctx, pdf_dict_getl(ctx, field, PDF_NAME_BS, PDF_NAME_S, NULL));
-
+ const char *bs = pdf_to_name(ctx, pdf_dict_getl(ctx, field, PDF_NAME_BS, PDF_NAME_S, NULL));
switch (*bs)
{
case 'S': return "Solid";
@@ -894,7 +893,6 @@ char *pdf_field_border_style(fz_context *ctx, pdf_document *doc, pdf_obj *field)
case 'I': return "Inset";
case 'U': return "Underline";
}
-
return "Solid";
}
diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c
index b5b5b635..d7f8df4f 100644
--- a/source/pdf/pdf-layer.c
+++ b/source/pdf/pdf-layer.c
@@ -473,7 +473,7 @@ pdf_layer_config_ui_info(fz_context *ctx, pdf_document *doc, int ui, pdf_layer_c
}
static int
-ocg_intents_include(fz_context *ctx, pdf_ocg_descriptor *desc, char *name)
+ocg_intents_include(fz_context *ctx, pdf_ocg_descriptor *desc, const char *name)
{
int i, len;
@@ -486,7 +486,7 @@ ocg_intents_include(fz_context *ctx, pdf_ocg_descriptor *desc, char *name)
if (pdf_is_name(ctx, desc->intent))
{
- char *intent = pdf_to_name(ctx, desc->intent);
+ const char *intent = pdf_to_name(ctx, desc->intent);
if (strcmp(intent, "All") == 0)
return 1;
return (strcmp(intent, name) == 0);
@@ -497,7 +497,7 @@ ocg_intents_include(fz_context *ctx, pdf_ocg_descriptor *desc, char *name)
len = pdf_array_len(ctx, desc->intent);
for (i=0; i < len; i++)
{
- char *intent = pdf_to_name(ctx, pdf_array_get(ctx, desc->intent, i));
+ const char *intent = pdf_to_name(ctx, pdf_array_get(ctx, desc->intent, i));
if (strcmp(intent, "All") == 0)
return 1;
if (strcmp(intent, name) == 0)
diff --git a/source/pdf/pdf-object.c b/source/pdf/pdf-object.c
index 3a903699..d6c7d8e3 100644
--- a/source/pdf/pdf-object.c
+++ b/source/pdf/pdf-object.c
@@ -175,7 +175,7 @@ pdf_obj *
pdf_new_name(fz_context *ctx, pdf_document *doc, const char *str)
{
pdf_obj_name *obj;
- char **stdname;
+ const char **stdname;
stdname = bsearch(str, &PDF_NAMES[1], PDF_OBJ_ENUM_NAME__LIMIT-1, sizeof(char *), namecmp);
if (stdname != NULL)
@@ -339,7 +339,7 @@ float pdf_to_real(fz_context *ctx, pdf_obj *obj)
return 0;
}
-char *pdf_to_name(fz_context *ctx, pdf_obj *obj)
+const char *pdf_to_name(fz_context *ctx, pdf_obj *obj)
{
RESOLVE(obj);
if (!OBJ_IS_NAME(obj))
diff --git a/source/pdf/pdf-portfolio.c b/source/pdf/pdf-portfolio.c
index 761b7c51..5c5b6d70 100644
--- a/source/pdf/pdf-portfolio.c
+++ b/source/pdf/pdf-portfolio.c
@@ -35,7 +35,7 @@ load_portfolio(fz_context *ctx, pdf_document *doc)
int editable = eo ? pdf_to_bool(ctx, eo) : 0;
pdf_obj *vo = pdf_dict_get(ctx, v, PDF_NAME_V);
int visible = vo ? pdf_to_bool(ctx, vo) : 1;
- char *subtype = pdf_to_name(ctx, pdf_dict_get(ctx, v, PDF_NAME_Subtype));
+ const char *subtype = pdf_to_name(ctx, pdf_dict_get(ctx, v, PDF_NAME_Subtype));
pdf_obj *name = pdf_dict_get(ctx, v, PDF_NAME_N);
pdf_portfolio *p = fz_malloc_struct(ctx, pdf_portfolio);
p->key = pdf_keep_obj(ctx, k);
diff --git a/source/pdf/pdf-stream.c b/source/pdf/pdf-stream.c
index 871ea40e..3650bd66 100644
--- a/source/pdf/pdf-stream.c
+++ b/source/pdf/pdf-stream.c
@@ -472,7 +472,7 @@ pdf_load_raw_stream_number(fz_context *ctx, pdf_document *doc, int num)
}
static int
-pdf_guess_filter_length(int len, char *filter)
+pdf_guess_filter_length(int len, const char *filter)
{
if (!strcmp(filter, "ASCIIHexDecode"))
return len / 2;
diff --git a/source/pdf/pdf-write.c b/source/pdf/pdf-write.c
index 1353f659..5e80cfa1 100644
--- a/source/pdf/pdf-write.c
+++ b/source/pdf/pdf-write.c
@@ -1757,7 +1757,7 @@ static void expandstream(fz_context *ctx, pdf_document *doc, pdf_write_state *op
pdf_drop_obj(ctx, obj);
}
-static int is_image_filter(char *s)
+static int is_image_filter(const char *s)
{
if (!strcmp(s, "CCITTFaxDecode") || !strcmp(s, "CCF") ||
!strcmp(s, "DCTDecode") || !strcmp(s, "DCT") ||
diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
index ce62e6b7..54821a25 100644
--- a/source/pdf/pdf-xref.c
+++ b/source/pdf/pdf-xref.c
@@ -1464,7 +1464,7 @@ pdf_init_document(fz_context *ctx, pdf_document *doc)
fz_try(ctx)
{
- char *version_str;
+ const char *version_str;
obj = pdf_dict_getl(ctx, pdf_trailer(ctx, doc), PDF_NAME_Root, PDF_NAME_Version, NULL);
version_str = pdf_to_name(ctx, obj);
if (*version_str)
diff --git a/source/tools/pdfextract.c b/source/tools/pdfextract.c
index 984cda16..1ae71c4f 100644
--- a/source/tools/pdfextract.c
+++ b/source/tools/pdfextract.c
@@ -144,7 +144,7 @@ static void savefont(pdf_obj *dict, int num)
pdf_obj *obj;
char *ext = "";
fz_output *out;
- char *fontname = "font";
+ const char *fontname = "font";
size_t len;
unsigned char *data;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 15:02:49 +0000