summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mupdf/fitz/document.h7
-rw-r--r--source/cbz/mucbz.c2
-rw-r--r--source/cbz/muimg.c2
-rw-r--r--source/cbz/mutiff.c2
-rw-r--r--source/fitz/document.c4
-rw-r--r--source/gprf/gprf-doc.c2
-rw-r--r--source/html/epub-doc.c2
-rw-r--r--source/html/html-doc.c2
-rw-r--r--source/pdf/pdf-page.c2
-rw-r--r--source/svg/svg-doc.c2
-rw-r--r--source/xps/xps-doc.c2
11 files changed, 16 insertions, 13 deletions
diff --git a/include/mupdf/fitz/document.h b/include/mupdf/fitz/document.h
index 3769a795..ae96dc5c 100644
--- a/include/mupdf/fitz/document.h
+++ b/include/mupdf/fitz/document.h
@@ -392,9 +392,12 @@ fz_page *fz_load_page(fz_context *ctx, fz_document *doc, int number);
fz_link *fz_load_links(fz_context *ctx, fz_page *page);
/*
- fz_new_page: Create and initialize a page struct.
+ fz_new_page_of_size: Create and initialize a page struct.
*/
-void *fz_new_page(fz_context *ctx, int size);
+fz_page *fz_new_page_of_size(fz_context *ctx, int size);
+
+#define fz_new_page(CTX,TYPE) \
+ ((TYPE *)Memento_label(fz_new_page_of_size(CTX,sizeof(TYPE)),#TYPE))
/*
fz_bound_page: Determine the size of a page at 72 dpi.
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index 2caee490..33aac13c 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -165,7 +165,7 @@ cbz_load_page(fz_context *ctx, cbz_document *doc, int number)
fz_try(ctx)
{
- page = fz_new_page(ctx, sizeof *page);
+ page = fz_new_page(ctx, cbz_page);
page->super.bound_page = (fz_page_bound_page_fn *)cbz_bound_page;
page->super.run_page_contents = (fz_page_run_page_contents_fn *)cbz_run_page;
page->super.drop_page = (fz_page_drop_page_fn *)cbz_drop_page;
diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c
index a02731c6..f985d460 100644
--- a/source/cbz/muimg.c
+++ b/source/cbz/muimg.c
@@ -69,7 +69,7 @@ img_load_page(fz_context *ctx, img_document *doc, int number)
if (number != 0)
return NULL;
- page = fz_new_page(ctx, sizeof *page);
+ page = fz_new_page(ctx, img_page);
page->super.bound_page = (fz_page_bound_page_fn *)img_bound_page;
page->super.run_page_contents = (fz_page_run_page_contents_fn *)img_run_page;
diff --git a/source/cbz/mutiff.c b/source/cbz/mutiff.c
index 44756b88..4e144aba 100644
--- a/source/cbz/mutiff.c
+++ b/source/cbz/mutiff.c
@@ -74,7 +74,7 @@ tiff_load_page(fz_context *ctx, tiff_document *doc, int number)
pixmap = fz_load_tiff_subimage(ctx, data, len, number);
image = fz_new_image_from_pixmap(ctx, pixmap, NULL);
- page = fz_new_page(ctx, sizeof *page);
+ page = fz_new_page(ctx, tiff_page);
page->super.bound_page = (fz_page_bound_page_fn *)tiff_bound_page;
page->super.run_page_contents = (fz_page_run_page_contents_fn *)tiff_run_page;
page->super.drop_page = (fz_page_drop_page_fn *)tiff_drop_page;
diff --git a/source/fitz/document.c b/source/fitz/document.c
index 41abb736..2fb64ad9 100644
--- a/source/fitz/document.c
+++ b/source/fitz/document.c
@@ -410,8 +410,8 @@ fz_drop_annot(fz_context *ctx, fz_annot *annot)
}
}
-void *
-fz_new_page(fz_context *ctx, int size)
+fz_page *
+fz_new_page_of_size(fz_context *ctx, int size)
{
fz_page *page = Memento_label(fz_calloc(ctx, 1, size), "fz_page");
page->refs = 1;
diff --git a/source/gprf/gprf-doc.c b/source/gprf/gprf-doc.c
index 83519982..f08286ad 100644
--- a/source/gprf/gprf-doc.c
+++ b/source/gprf/gprf-doc.c
@@ -864,7 +864,7 @@ static fz_page *
gprf_load_page(fz_context *ctx, fz_document *doc_, int number)
{
gprf_document *doc = (gprf_document*)doc_;
- gprf_page *page = fz_new_page(ctx, sizeof *page);
+ gprf_page *page = fz_new_page(ctx, gprf_page);
fz_try(ctx)
{
diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c
index dab46155..d443dbae 100644
--- a/source/html/epub-doc.c
+++ b/source/html/epub-doc.c
@@ -215,7 +215,7 @@ static fz_page *
epub_load_page(fz_context *ctx, fz_document *doc_, int number)
{
epub_document *doc = (epub_document*)doc_;
- epub_page *page = fz_new_page(ctx, sizeof *page);
+ epub_page *page = fz_new_page(ctx, epub_page);
page->super.bound_page = epub_bound_page;
page->super.run_page_contents = epub_run_page;
page->super.load_links = epub_load_links;
diff --git a/source/html/html-doc.c b/source/html/html-doc.c
index 5802e460..d9d7d27f 100644
--- a/source/html/html-doc.c
+++ b/source/html/html-doc.c
@@ -115,7 +115,7 @@ static fz_page *
htdoc_load_page(fz_context *ctx, fz_document *doc_, int number)
{
html_document *doc = (html_document*)doc_;
- html_page *page = fz_new_page(ctx, sizeof *page);
+ html_page *page = fz_new_page(ctx, html_page);
page->super.bound_page = htdoc_bound_page;
page->super.run_page_contents = htdoc_run_page;
page->super.load_links = htdoc_load_links;
diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c
index 0699c672..1eec063c 100644
--- a/source/pdf/pdf-page.c
+++ b/source/pdf/pdf-page.c
@@ -649,7 +649,7 @@ pdf_drop_page_imp(fz_context *ctx, pdf_page *page)
static pdf_page *
pdf_new_page(fz_context *ctx, pdf_document *doc)
{
- pdf_page *page = fz_new_page(ctx, sizeof(*page));
+ pdf_page *page = fz_new_page(ctx, pdf_page);
page->doc = (pdf_document*) fz_keep_document(ctx, &doc->super);
diff --git a/source/svg/svg-doc.c b/source/svg/svg-doc.c
index bfd40065..b535b380 100644
--- a/source/svg/svg-doc.c
+++ b/source/svg/svg-doc.c
@@ -61,7 +61,7 @@ svg_load_page(fz_context *ctx, fz_document *doc_, int number)
if (number != 0)
return NULL;
- page = fz_new_page(ctx, sizeof *page);
+ page = fz_new_page(ctx, svg_page);
page->super.bound_page = svg_bound_page;
page->super.run_page_contents = svg_run_page;
page->super.drop_page = svg_drop_page;
diff --git a/source/xps/xps-doc.c b/source/xps/xps-doc.c
index 8f708bf7..1a7b4dd7 100644
--- a/source/xps/xps-doc.c
+++ b/source/xps/xps-doc.c
@@ -439,7 +439,7 @@ xps_load_page(fz_context *ctx, xps_document *doc, int number)
root = xps_load_fixed_page(ctx, doc, fix);
fz_try(ctx)
{
- page = fz_new_page(ctx, sizeof *page);
+ page = fz_new_page(ctx, xps_page);
page->super.load_links = (fz_page_load_links_fn *)xps_load_links;
page->super.bound_page = (fz_page_bound_page_fn *)xps_bound_page;
page->super.run_page_contents = (fz_page_run_page_contents_fn *)xps_run_page;
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 23:14:05 +0000