From aa7668835afffd5a2a496a60ed6edb672f5af1a7 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 21 Sep 2011 15:01:36 +0200 Subject: Rename malloc functions for arrays (fz_calloc and fz_realloc). --- pdf/pdf_function.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pdf/pdf_function.c') diff --git a/pdf/pdf_function.c b/pdf/pdf_function.c index 7ab681c3..50b09926 100644 --- a/pdf/pdf_function.c +++ b/pdf/pdf_function.c @@ -677,7 +677,7 @@ resize_code(fz_context *ctx, pdf_function *func, int newsize) if (newsize >= func->u.p.cap) { func->u.p.cap = func->u.p.cap + 64; - func->u.p.code = fz_realloc(ctx, func->u.p.code, func->u.p.cap * sizeof(psobj)); + func->u.p.code = fz_resize_array(ctx, func->u.p.code, func->u.p.cap, sizeof(psobj)); } } @@ -960,7 +960,7 @@ load_sample_func(pdf_function *func, pdf_xref *xref, fz_obj *dict, int num, int for (i = 0, samplecount = func->n; i < func->m; i++) samplecount *= func->u.sa.size[i]; - func->u.sa.samples = fz_calloc(ctx, samplecount, sizeof(float)); + func->u.sa.samples = fz_malloc_array(ctx, samplecount, sizeof(float)); error = pdf_open_stream(&stream, xref, num, gen); if (error) @@ -1206,9 +1206,9 @@ load_stitching_func(pdf_function *func, pdf_xref *xref, fz_obj *dict) { k = fz_array_len(obj); - func->u.st.funcs = fz_calloc(ctx, k, sizeof(pdf_function*)); - func->u.st.bounds = fz_calloc(ctx, k - 1, sizeof(float)); - func->u.st.encode = fz_calloc(ctx, k * 2, sizeof(float)); + func->u.st.funcs = fz_malloc_array(ctx, k, sizeof(pdf_function*)); + func->u.st.bounds = fz_malloc_array(ctx, k - 1, sizeof(float)); + func->u.st.encode = fz_malloc_array(ctx, k * 2, sizeof(float)); funcs = func->u.st.funcs; for (i = 0; i < k; i++) -- cgit v1.2.3