summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/pdfapp.c8
-rw-r--r--apps/pdfdraw.c4
-rw-r--r--apps/pdfextract.c2
-rw-r--r--apps/pdfinfo.c2
-rw-r--r--draw/glyphcache.c2
-rw-r--r--fitz/base_hash.c2
-rw-r--r--fitz/fitz_base.h2
-rw-r--r--fitz/stm_misc.c3
-rw-r--r--fitz/stm_open.c8
-rw-r--r--mupdf/mupdf.h8
-rw-r--r--mupdf/pdf_annot.c4
-rw-r--r--mupdf/pdf_outline.c8
-rw-r--r--mupdf/pdf_page.c8
-rw-r--r--mupdf/pdf_store.c4
14 files changed, 32 insertions, 33 deletions
diff --git a/apps/pdfapp.c b/apps/pdfapp.c
index 7509f334..0442b1fc 100644
--- a/apps/pdfapp.c
+++ b/apps/pdfapp.c
@@ -146,7 +146,7 @@ void pdfapp_close(pdfapp_t *app)
app->cache = nil;
if (app->page)
- pdf_droppage(app->page);
+ pdf_freepage(app->page);
app->page = nil;
if (app->image)
@@ -158,11 +158,11 @@ void pdfapp_close(pdfapp_t *app)
app->text = nil;
if (app->outline)
- pdf_dropoutline(app->outline);
+ pdf_freeoutline(app->outline);
app->outline = nil;
if (app->xref->store)
- pdf_dropstore(app->xref->store);
+ pdf_freestore(app->xref->store);
app->xref->store = nil;
pdf_closexref(app->xref);
@@ -222,7 +222,7 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
wincursor(app, WAIT);
if (app->page)
- pdf_droppage(app->page);
+ pdf_freepage(app->page);
app->page = nil;
pdf_flushxref(app->xref, 0);
diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c
index d73ea011..345d8c73 100644
--- a/apps/pdfdraw.c
+++ b/apps/pdfdraw.c
@@ -41,7 +41,7 @@ static void local_cleanup(void)
{
if (xref && xref->store)
{
- pdf_dropstore(xref->store);
+ pdf_freestore(xref->store);
xref->store = nil;
}
if (drawcache)
@@ -122,7 +122,7 @@ static void drawloadpage(int pagenum, struct benchmark *loadtimes)
static void drawfreepage(void)
{
- pdf_droppage(drawpage);
+ pdf_freepage(drawpage);
drawpage = nil;
flushxref();
diff --git a/apps/pdfextract.c b/apps/pdfextract.c
index 561d1bb3..25b00e8e 100644
--- a/apps/pdfextract.c
+++ b/apps/pdfextract.c
@@ -107,7 +107,7 @@ static void saveimage(int num, int gen)
fz_droppixmap(pix);
- pdf_dropstore(xref->store);
+ pdf_freestore(xref->store);
xref->store = nil;
pdf_dropimage(img);
diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c
index 1f7c9e73..ceeb8ded 100644
--- a/apps/pdfinfo.c
+++ b/apps/pdfinfo.c
@@ -148,7 +148,7 @@ static void local_cleanup(void)
if (xref && xref->store)
{
- pdf_dropstore(xref->store);
+ pdf_freestore(xref->store);
xref->store = nil;
}
}
diff --git a/draw/glyphcache.c b/draw/glyphcache.c
index 0f8abf75..e98373d9 100644
--- a/draw/glyphcache.c
+++ b/draw/glyphcache.c
@@ -59,7 +59,7 @@ void
fz_freeglyphcache(fz_glyphcache *cache)
{
fz_evictglyphcache(cache);
- fz_drophash(cache->hash);
+ fz_freehash(cache->hash);
fz_free(cache);
}
diff --git a/fitz/base_hash.c b/fitz/base_hash.c
index 8b1db399..9f96b75d 100644
--- a/fitz/base_hash.c
+++ b/fitz/base_hash.c
@@ -87,7 +87,7 @@ fz_hashgetval(fz_hashtable *table, int idx)
}
void
-fz_drophash(fz_hashtable *table)
+fz_freehash(fz_hashtable *table)
{
fz_free(table->ents);
fz_free(table);
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h
index 94197a1a..77ff594c 100644
--- a/fitz/fitz_base.h
+++ b/fitz/fitz_base.h
@@ -177,7 +177,7 @@ typedef struct fz_hashtable_s fz_hashtable;
fz_hashtable * fz_newhash(int initialsize, int keylen);
void fz_debughash(fz_hashtable *table);
void fz_emptyhash(fz_hashtable *table);
-void fz_drophash(fz_hashtable *table);
+void fz_freehash(fz_hashtable *table);
void *fz_hashfind(fz_hashtable *table, void *key);
void fz_hashinsert(fz_hashtable *table, void *key, void *val);
diff --git a/fitz/stm_misc.c b/fitz/stm_misc.c
index 351cedbf..398d4388 100644
--- a/fitz/stm_misc.c
+++ b/fitz/stm_misc.c
@@ -40,7 +40,8 @@ fz_readline(fz_stream *stm, char *mem, int n)
return fz_okay;
}
-static inline int fz_fillbuf(fz_stream *stm, fz_buffer *buf)
+static inline int
+fz_fillbuf(fz_stream *stm, fz_buffer *buf)
{
int remaining = buf->ep - buf->wp;
int available = stm->buffer->wp - stm->buffer->rp;
diff --git a/fitz/stm_open.c b/fitz/stm_open.c
index c15f803f..793504af 100644
--- a/fitz/stm_open.c
+++ b/fitz/stm_open.c
@@ -5,7 +5,7 @@
#include "fitz.h"
static fz_stream *
-newstm(int kind)
+fz_newstream(int kind)
{
fz_stream *stm;
@@ -66,7 +66,7 @@ fz_openfile(int fd)
{
fz_stream *stm;
- stm = newstm(FZ_SFILE);
+ stm = fz_newstream(FZ_SFILE);
stm->buffer = fz_newbuffer(FZ_BUFSIZE);
stm->file = fd;
@@ -78,7 +78,7 @@ fz_openfilter(fz_filter *flt, fz_stream *src)
{
fz_stream *stm;
- stm = newstm(FZ_SFILTER);
+ stm = fz_newstream(FZ_SFILTER);
stm->buffer = fz_newbuffer(FZ_BUFSIZE);
stm->chain = fz_keepstream(src);
stm->filter = fz_keepfilter(flt);
@@ -91,7 +91,7 @@ fz_openbuffer(fz_buffer *buf)
{
fz_stream *stm;
- stm = newstm(FZ_SBUFFER);
+ stm = fz_newstream(FZ_SBUFFER);
stm->buffer = fz_keepbuffer(buf);
stm->buffer->eof = 1;
diff --git a/mupdf/mupdf.h b/mupdf/mupdf.h
index ba8901d7..95f54d97 100644
--- a/mupdf/mupdf.h
+++ b/mupdf/mupdf.h
@@ -183,7 +183,7 @@ typedef enum pdf_itemkind_e
pdf_store * pdf_newstore(void);
void pdf_emptystore(pdf_store *store);
-void pdf_dropstore(pdf_store *store);
+void pdf_freestore(pdf_store *store);
void pdf_debugstore(pdf_store *store);
void pdf_agestoreditems(pdf_store *store);
@@ -538,11 +538,11 @@ fz_obj *pdf_lookupdest(pdf_xref *xref, fz_obj *nameddest);
pdf_link *pdf_newlink(pdf_linkkind kind, fz_rect rect, fz_obj *dest);
pdf_link *pdf_loadlink(pdf_xref *xref, fz_obj *dict);
-void pdf_droplink(pdf_link *link);
+void pdf_freelink(pdf_link *link);
pdf_outline *pdf_loadoutline(pdf_xref *xref);
void pdf_debugoutline(pdf_outline *outline, int level);
-void pdf_dropoutline(pdf_outline *outline);
+void pdf_freeoutline(pdf_outline *outline);
void pdf_loadannots(pdf_comment **, pdf_link **, pdf_xref *, fz_obj *annots);
@@ -569,7 +569,7 @@ int pdf_findpageobject(pdf_xref *xref, fz_obj *pageobj);
/* page.c */
fz_error pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *ref);
-void pdf_droppage(pdf_page *page);
+void pdf_freepage(pdf_page *page);
/*
* content stream parsing
diff --git a/mupdf/pdf_annot.c b/mupdf/pdf_annot.c
index 3aed828b..70ae1360 100644
--- a/mupdf/pdf_annot.c
+++ b/mupdf/pdf_annot.c
@@ -13,10 +13,10 @@ pdf_newlink(pdf_linkkind kind, fz_rect bbox, fz_obj *dest)
}
void
-pdf_droplink(pdf_link *link)
+pdf_freelink(pdf_link *link)
{
if (link->next)
- pdf_droplink(link->next);
+ pdf_freelink(link->next);
if (link->dest)
fz_dropobj(link->dest);
fz_free(link);
diff --git a/mupdf/pdf_outline.c b/mupdf/pdf_outline.c
index 3201182d..0a209d60 100644
--- a/mupdf/pdf_outline.c
+++ b/mupdf/pdf_outline.c
@@ -76,14 +76,14 @@ pdf_loadoutline(pdf_xref *xref)
}
void
-pdf_dropoutline(pdf_outline *outline)
+pdf_freeoutline(pdf_outline *outline)
{
if (outline->child)
- pdf_dropoutline(outline->child);
+ pdf_freeoutline(outline->child);
if (outline->next)
- pdf_dropoutline(outline->next);
+ pdf_freeoutline(outline->next);
if (outline->link)
- pdf_droplink(outline->link);
+ pdf_freelink(outline->link);
fz_free(outline->title);
fz_free(outline);
}
diff --git a/mupdf/pdf_page.c b/mupdf/pdf_page.c
index 19b8ca5f..e629d110 100644
--- a/mupdf/pdf_page.c
+++ b/mupdf/pdf_page.c
@@ -122,7 +122,7 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
error = pdf_loadpagecontents(&page->contents, xref, obj);
if (error)
{
- pdf_droppage(page);
+ pdf_freepage(page);
return fz_rethrow(error, "cannot load page contents (%d %d R)", fz_tonum(obj), fz_togen(obj));
}
@@ -133,7 +133,7 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
}
void
-pdf_droppage(pdf_page *page)
+pdf_freepage(pdf_page *page)
{
pdf_logpage("drop page %p\n", page);
if (page->resources)
@@ -141,8 +141,6 @@ pdf_droppage(pdf_page *page)
if (page->contents)
fz_dropbuffer(page->contents);
if (page->links)
- pdf_droplink(page->links);
-// if (page->comments)
-// pdf_dropcomment(page->comments);
+ pdf_freelink(page->links);
fz_free(page);
}
diff --git a/mupdf/pdf_store.c b/mupdf/pdf_store.c
index 90358ed8..29a402ef 100644
--- a/mupdf/pdf_store.c
+++ b/mupdf/pdf_store.c
@@ -133,10 +133,10 @@ pdf_emptystore(pdf_store *store)
}
void
-pdf_dropstore(pdf_store *store)
+pdf_freestore(pdf_store *store)
{
pdf_emptystore(store);
- fz_drophash(store->hash);
+ fz_freehash(store->hash);
fz_free(store);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-24 21:22:14 +0000