diff options
-rw-r--r-- | fitz/fitz.h | 18 | ||||
-rw-r--r-- | pdf/pdf_function.c | 10 | ||||
-rw-r--r-- | pdf/pdf_repair.c | 2 | ||||
-rw-r--r-- | pdf/pdf_xref.c | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/fitz/fitz.h b/fitz/fitz.h index 94a3eea2..81743d0a 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -108,7 +108,7 @@ struct fz_alloc_context_s void *user; void *(*malloc)(void *, unsigned int); void *(*realloc)(void *, void *, unsigned int); - void (*free)(void *, void *); + void (*free)(void *, void *); }; /* Default allocator */ @@ -174,19 +174,19 @@ void fz_free_aa_context(fz_context *ctx); /* memory allocation */ /* The following throw exceptions on failure to allocate */ -void *fz_malloc(fz_context *ctx, unsigned int size); -void *fz_malloc_array(fz_context *ctx, unsigned int count, unsigned int size); -void *fz_calloc(fz_context *ctx, unsigned int count, unsigned int size); -void *fz_resize_array(fz_context *ctx, void *p, unsigned int count, unsigned int size); +void *fz_malloc(fz_context *ctx, unsigned int size); +void *fz_malloc_array(fz_context *ctx, unsigned int count, unsigned int size); +void *fz_calloc(fz_context *ctx, unsigned int count, unsigned int size); +void *fz_resize_array(fz_context *ctx, void *p, unsigned int count, unsigned int size); char *fz_strdup(fz_context *ctx, char *s); void fz_free(fz_context *ctx, void *p); /* The following returns NULL on failure to allocate */ -void *fz_malloc_no_throw(fz_context *ctx, unsigned int size); -void *fz_malloc_array_no_throw(fz_context *ctx, unsigned int count, unsigned int size); -void *fz_calloc_no_throw(fz_context *ctx, unsigned int count, unsigned int size); -void *fz_resize_array_no_throw(fz_context *ctx, void *p, unsigned int count, unsigned int size); +void *fz_malloc_no_throw(fz_context *ctx, unsigned int size); +void *fz_malloc_array_no_throw(fz_context *ctx, unsigned int count, unsigned int size); +void *fz_calloc_no_throw(fz_context *ctx, unsigned int count, unsigned int size); +void *fz_resize_array_no_throw(fz_context *ctx, void *p, unsigned int count, unsigned int size); char *fz_strdup_no_throw(fz_context *ctx, char *s); diff --git a/pdf/pdf_function.c b/pdf/pdf_function.c index 26d4bcec..31221cb8 100644 --- a/pdf/pdf_function.c +++ b/pdf/pdf_function.c @@ -1422,11 +1422,11 @@ pdf_load_function(pdf_xref *xref, fz_obj *dict) { pdf_drop_function(ctx, func); fz_throw(ctx, "cannot load %s function (%d %d R)", - (func->type == SAMPLE ? "sampled" : - (func->type == EXPONENTIAL ? "exponential" : - (func->type == STITCHING ? "stitching" : - (func->type == POSTSCRIPT ? "calculator" : - "unknown")))), fz_to_num(dict), fz_to_gen(dict)); + (func->type == SAMPLE ? "sampled" : + (func->type == EXPONENTIAL ? "exponential" : + (func->type == STITCHING ? "stitching" : + (func->type == POSTSCRIPT ? "calculator" : + "unknown")))), fz_to_num(dict), fz_to_gen(dict)); } fz_store_item(ctx, dict, func, func->size); diff --git a/pdf/pdf_repair.c b/pdf/pdf_repair.c index 69fd142b..26e446c3 100644 --- a/pdf/pdf_repair.c +++ b/pdf/pdf_repair.c @@ -148,7 +148,7 @@ pdf_repair_obj_stm(pdf_xref *xref, int num, int gen) fz_context *ctx = xref->ctx; fz_try(ctx) - { + { obj = pdf_load_object(xref, num, gen); count = fz_to_int(fz_dict_gets(obj, "N")); diff --git a/pdf/pdf_xref.c b/pdf/pdf_xref.c index 6b05e969..b560d868 100644 --- a/pdf/pdf_xref.c +++ b/pdf/pdf_xref.c @@ -1080,5 +1080,5 @@ pdf_open_xref(fz_context *ctx, const char *filename, char *password) } fz_close(file); - return xref; + return xref; } |