summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
Diffstat (limited to 'filter')
-rw-r--r--filter/a85d.c3
-rw-r--r--filter/a85e.c3
-rw-r--r--filter/ahxd.c3
-rw-r--r--filter/ahxe.c3
-rw-r--r--filter/arc4filter.c3
-rw-r--r--filter/buffer.c2
-rw-r--r--filter/dctd.c2
-rw-r--r--filter/dcte.c4
-rw-r--r--filter/faxd.c3
-rw-r--r--filter/faxe.c3
-rw-r--r--filter/filec.c20
-rw-r--r--filter/filter.c6
-rw-r--r--filter/flate.c6
-rw-r--r--filter/jbig2d.c3
-rw-r--r--filter/jpxd.c3
-rw-r--r--filter/lzwd.c3
-rw-r--r--filter/lzwe.c3
-rw-r--r--filter/null.c3
-rw-r--r--filter/pipeline.c11
-rw-r--r--filter/predict.c3
-rw-r--r--filter/rld.c3
-rw-r--r--filter/rle.c3
22 files changed, 39 insertions, 57 deletions
diff --git a/filter/a85d.c b/filter/a85d.c
index 08c96a1b..5b2e105e 100644
--- a/filter/a85d.c
+++ b/filter/a85d.c
@@ -29,9 +29,8 @@ fz_newa85d(fz_filter **fp, fz_obj *params)
}
void
-fz_freea85d(fz_filter *f)
+fz_dropa85d(fz_filter *f)
{
- fz_free(f);
}
fz_error *
diff --git a/filter/a85e.c b/filter/a85e.c
index c57aac4f..d9cd22c6 100644
--- a/filter/a85e.c
+++ b/filter/a85e.c
@@ -17,9 +17,8 @@ fz_newa85e(fz_filter **fp, fz_obj *params)
}
void
-fz_freea85e(fz_filter *f)
+fz_dropa85e(fz_filter *f)
{
- fz_free(f);
}
fz_error *
diff --git a/filter/ahxd.c b/filter/ahxd.c
index b557399c..d0e6d7f5 100644
--- a/filter/ahxd.c
+++ b/filter/ahxd.c
@@ -47,9 +47,8 @@ fz_newahxd(fz_filter **fp, fz_obj *params)
}
void
-fz_freeahxd(fz_filter *f)
+fz_dropahxd(fz_filter *f)
{
- fz_free(f);
}
fz_error *
diff --git a/filter/ahxe.c b/filter/ahxe.c
index e092653b..c2b882a6 100644
--- a/filter/ahxe.c
+++ b/filter/ahxe.c
@@ -19,9 +19,8 @@ fz_newahxe(fz_filter **fp, fz_obj *params)
}
void
-fz_freeahxe(fz_filter *f)
+fz_dropahxe(fz_filter *f)
{
- fz_free(f);
}
fz_error *
diff --git a/filter/arc4filter.c b/filter/arc4filter.c
index 257462d8..b025368c 100644
--- a/filter/arc4filter.c
+++ b/filter/arc4filter.c
@@ -17,9 +17,8 @@ fz_newarc4filter(fz_filter **fp, unsigned char *key, unsigned keylen)
}
void
-fz_freearc4filter(fz_filter *f)
+fz_droparc4filter(fz_filter *f)
{
- fz_free(f);
}
fz_error *
diff --git a/filter/buffer.c b/filter/buffer.c
index def667ea..1b7a0793 100644
--- a/filter/buffer.c
+++ b/filter/buffer.c
@@ -40,7 +40,7 @@ fz_newbufferwithdata(fz_buffer **bp, unsigned char *data, int size)
}
void
-fz_freebuffer(fz_buffer *buf)
+fz_dropbuffer(fz_buffer *buf)
{
if (buf->ownsdata)
fz_free(buf->bp);
diff --git a/filter/dctd.c b/filter/dctd.c
index dd978ac7..0c0b072e 100644
--- a/filter/dctd.c
+++ b/filter/dctd.c
@@ -95,7 +95,7 @@ fz_newdctd(fz_filter **fp, fz_obj *params)
}
void
-fz_freedctd(fz_filter *filter)
+fz_dropdctd(fz_filter *filter)
{
fz_dctd *d = (fz_dctd*)filter;
if (setjmp(d->err.jb)) {
diff --git a/filter/dcte.c b/filter/dcte.c
index 52933789..547721b4 100644
--- a/filter/dcte.c
+++ b/filter/dcte.c
@@ -122,7 +122,7 @@ fz_newdcte(fz_filter **fp, fz_obj *params)
}
void
-fz_freedcte(fz_filter *filter)
+fz_dropdcte(fz_filter *filter)
{
fz_dcte *e = (fz_dcte*)filter;
@@ -132,8 +132,6 @@ fz_freedcte(fz_filter *filter)
}
jpeg_destroy_compress(&e->cinfo);
-
- fz_free(e);
}
/* Adobe says zigzag order. IJG > v6a says natural order. */
diff --git a/filter/faxd.c b/filter/faxd.c
index 1b86c17b..81e04b81 100644
--- a/filter/faxd.c
+++ b/filter/faxd.c
@@ -114,12 +114,11 @@ fz_newfaxd(fz_filter **fp, fz_obj *params)
}
void
-fz_freefaxd(fz_filter *p)
+fz_dropfaxd(fz_filter *p)
{
fz_faxd *fax = (fz_faxd*) p;
fz_free(fax->ref);
fz_free(fax->dst);
- fz_free(fax);
}
static inline void eatbits(fz_faxd *fax, int nbits)
diff --git a/filter/faxe.c b/filter/faxe.c
index 20e776dd..ccede1a1 100644
--- a/filter/faxe.c
+++ b/filter/faxe.c
@@ -95,12 +95,11 @@ fz_newfaxe(fz_filter **fp, fz_obj *params)
}
void
-fz_freefaxe(fz_filter *p)
+fz_dropfaxe(fz_filter *p)
{
fz_faxe *fax = (fz_faxe*) p;
fz_free(fax->src);
fz_free(fax->ref);
- fz_free(fax);
}
enum { codebytes = 2 };
diff --git a/filter/filec.c b/filter/filec.c
index f03be8a4..4c132b33 100644
--- a/filter/filec.c
+++ b/filter/filec.c
@@ -126,26 +126,26 @@ fz_closefile(fz_file *file)
if (file->error)
{
fz_warn("%s", file->error->msg);
- fz_freeerror(file->error);
+ fz_droperror(file->error);
file->error = nil;
}
if (file->fd == -1) /* open to buffer not file */
{
if (file->mode == FZ_READ)
- fz_freebuffer(file->in);
+ fz_dropbuffer(file->in);
else
- fz_freebuffer(file->out);
+ fz_dropbuffer(file->out);
}
else
{
- fz_freebuffer(file->in);
- fz_freebuffer(file->out);
+ fz_dropbuffer(file->in);
+ fz_dropbuffer(file->out);
close(file->fd);
}
if (file->filter)
- fz_freefilter(file->filter);
+ fz_dropfilter(file->filter);
fz_free(file);
}
@@ -230,13 +230,13 @@ fz_popfilter(fz_file *file)
if (file->error)
{
fz_warn("%s", file->error->msg);
- fz_freeerror(file->error);
+ fz_droperror(file->error);
file->error = nil;
}
if (file->depth == 1)
{
- fz_freefilter(file->filter);
+ fz_dropfilter(file->filter);
file->filter = nil;
buf = file->out;
@@ -247,12 +247,12 @@ fz_popfilter(fz_file *file)
{
if (file->mode == FZ_READ)
{
- fz_freebuffer(file->out);
+ fz_dropbuffer(file->out);
fz_unchainpipeline(file->filter, &file->filter, &file->out);
}
else
{
- fz_freebuffer(file->in);
+ fz_dropbuffer(file->in);
fz_unchainpipeline(file->filter, &file->filter, &file->in);
}
}
diff --git a/filter/filter.c b/filter/filter.c
index 68dd70b9..25bbd441 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -32,8 +32,10 @@ fz_process(fz_filter *f, fz_buffer *in, fz_buffer *out)
}
void
-fz_freefilter(fz_filter *f)
+fz_dropfilter(fz_filter *f)
{
- f->free(f);
+ if (f->drop)
+ f->drop(f);
+ fz_free(f);
}
diff --git a/filter/flate.c b/filter/flate.c
index f7046474..c34a49b7 100644
--- a/filter/flate.c
+++ b/filter/flate.c
@@ -42,7 +42,7 @@ fz_newflated(fz_filter **fp, fz_obj *params)
}
void
-fz_freeflated(fz_filter *f)
+fz_dropflated(fz_filter *f)
{
z_streamp zp = &((fz_flate*)f)->z;
int err;
@@ -50,8 +50,6 @@ fz_freeflated(fz_filter *f)
err = inflateEnd(zp);
if (err != Z_OK)
fprintf(stderr, "inflateEnd: %s", zp->msg);
-
- fz_free(f);
}
fz_error *
@@ -126,7 +124,7 @@ fz_newflatee(fz_filter **fp, fz_obj *params)
}
void
-fz_freeflatee(fz_filter *f)
+fz_dropflatee(fz_filter *f)
{
z_streamp zp = &((fz_flate*)f)->z;
int err;
diff --git a/filter/jbig2d.c b/filter/jbig2d.c
index 3d191e65..5d762d2f 100644
--- a/filter/jbig2d.c
+++ b/filter/jbig2d.c
@@ -51,11 +51,10 @@ fz_newjbig2d(fz_filter **fp, fz_obj *params)
}
void
-fz_freejbig2d(fz_filter *filter)
+fz_dropjbig2d(fz_filter *filter)
{
fz_jbig2d *d = (fz_jbig2d*)filter;
jbig2_ctx_free(d->ctx);
- fz_free(d);
}
fz_error *
diff --git a/filter/jpxd.c b/filter/jpxd.c
index 26ec743b..2aa93448 100644
--- a/filter/jpxd.c
+++ b/filter/jpxd.c
@@ -60,12 +60,11 @@ fz_newjpxd(fz_filter **fp, fz_obj *params)
}
void
-fz_freejpxd(fz_filter *filter)
+fz_dropjpxd(fz_filter *filter)
{
fz_jpxd *d = (fz_jpxd*)filter;
if (d->stream) jas_stream_close(d->stream);
if (d->image) jas_image_destroy(d->image);
- fz_free(d);
}
fz_error *
diff --git a/filter/lzwd.c b/filter/lzwd.c
index 1ab47357..b3a0dcfa 100644
--- a/filter/lzwd.c
+++ b/filter/lzwd.c
@@ -91,9 +91,8 @@ fz_newlzwd(fz_filter **fp, fz_obj *params)
}
void
-fz_freelzwd(fz_filter *filter)
+fz_droplzwd(fz_filter *filter)
{
- fz_free(filter);
}
static inline void eatbits(fz_lzwd *lzw, int nbits)
diff --git a/filter/lzwe.c b/filter/lzwe.c
index dbb6967b..8065a7b6 100644
--- a/filter/lzwe.c
+++ b/filter/lzwe.c
@@ -91,9 +91,8 @@ fz_newlzwe(fz_filter **fp, fz_obj *params)
}
void
-fz_freelzwe(fz_filter *filter)
+fz_droplzwe(fz_filter *filter)
{
- fz_free(filter);
}
static void
diff --git a/filter/null.c b/filter/null.c
index a4af03b1..e83b6d5a 100644
--- a/filter/null.c
+++ b/filter/null.c
@@ -19,9 +19,8 @@ fz_newnullfilter(fz_filter **fp, int len)
}
void
-fz_freenullfilter(fz_filter *f)
+fz_dropnullfilter(fz_filter *f)
{
- fz_free(f);
}
fz_error *
diff --git a/filter/pipeline.c b/filter/pipeline.c
index ef0412c0..4ac0da58 100644
--- a/filter/pipeline.c
+++ b/filter/pipeline.c
@@ -32,7 +32,7 @@ fz_unchainpipeline(fz_filter *filter, fz_filter **oldfp, fz_buffer **oldbp)
fz_pipeline *p = (fz_pipeline*)filter;
*oldfp = p->head;
*oldbp = p->buffer;
- fz_freefilter(p->tail);
+ fz_dropfilter(p->tail);
fz_free(p);
}
@@ -53,13 +53,12 @@ fz_newpipeline(fz_filter **fp, fz_filter *head, fz_filter *tail)
}
void
-fz_freepipeline(fz_filter *filter)
+fz_droppipeline(fz_filter *filter)
{
fz_pipeline *p = (fz_pipeline*)filter;
- fz_freefilter(p->head);
- fz_freefilter(p->tail);
- fz_freebuffer(p->buffer);
- fz_free(p);
+ fz_dropfilter(p->head);
+ fz_dropfilter(p->tail);
+ fz_dropbuffer(p->buffer);
}
fz_error *
diff --git a/filter/predict.c b/filter/predict.c
index d5f1f54d..d7b594ac 100644
--- a/filter/predict.c
+++ b/filter/predict.c
@@ -64,11 +64,10 @@ fz_newpredict(fz_filter **fp, fz_obj *params, int encode)
}
void
-fz_freepredict(fz_filter *filter)
+fz_droppredict(fz_filter *filter)
{
fz_predict *p = (fz_predict*)filter;
fz_free(p->ref);
- fz_free(p);
}
static inline int
diff --git a/filter/rld.c b/filter/rld.c
index a66e0f94..bcad4323 100644
--- a/filter/rld.c
+++ b/filter/rld.c
@@ -8,9 +8,8 @@ fz_newrld(fz_filter **fp, fz_obj *params)
}
void
-fz_freerld(fz_filter *rld)
+fz_droprld(fz_filter *rld)
{
- fz_free(rld);
}
fz_error *
diff --git a/filter/rle.c b/filter/rle.c
index 0e611918..53197139 100644
--- a/filter/rle.c
+++ b/filter/rle.c
@@ -45,9 +45,8 @@ fz_newrle(fz_filter **fp, fz_obj *params)
}
void
-fz_freerle(fz_filter *enc)
+fz_droprle(fz_filter *enc)
{
- fz_free(enc);
}
static fz_error *
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-20 00:35:17 +0000