summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Rasmussen <sebras@gmail.com>2016-10-12 01:57:14 +0800
committerSebastian Rasmussen <sebras@gmail.com>2016-10-16 12:51:01 +0800
commit6b3af91f1d2349f93ceb77f38a82f640e44c95bc (patch)
treec0f04cb8c933a3a373ebdda0d5d81a05cae9e320
parentd19274fac0308da5fa65a1bcef93222416fe0578 (diff)
downloadmupdf-6b3af91f1d2349f93ceb77f38a82f640e44c95bc.tar.xz
Avoid casting when dropping super objects.
-rw-r--r--platform/java/mupdf_native.c2
-rw-r--r--source/gprf/gprf-doc.c4
-rw-r--r--source/pdf/pdf-annot-edit.c2
-rw-r--r--source/pdf/pdf-annot.c2
-rw-r--r--source/pdf/pdf-graft.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c
index 584123b4..cab67471 100644
--- a/platform/java/mupdf_native.c
+++ b/platform/java/mupdf_native.c
@@ -5631,7 +5631,7 @@ FUN(PDFDocument_finalize)(JNIEnv *env, jobject self)
if (!ctx || !pdf) return;
- fz_drop_document(ctx, (fz_document *) pdf);
+ fz_drop_document(ctx, &pdf->super);
}
JNIEXPORT jint JNICALL
diff --git a/source/gprf/gprf-doc.c b/source/gprf/gprf-doc.c
index 9f9d5ebb..a1017678 100644
--- a/source/gprf/gprf-doc.c
+++ b/source/gprf/gprf-doc.c
@@ -139,7 +139,7 @@ gprf_drop_page_imp(fz_context *ctx, fz_page *page_)
gprf_document *doc = page->doc;
int i;
- fz_drop_document(ctx, (fz_document *)doc);
+ fz_drop_document(ctx, &doc->super);
if (page->tiles)
{
for (i = 0; i < page->num_tiles; i++)
@@ -883,7 +883,7 @@ gprf_load_page(fz_context *ctx, fz_document *doc_, int number)
}
fz_catch(ctx)
{
- fz_drop_page(ctx, (fz_page *)page);
+ fz_drop_page(ctx, &page->super);
fz_rethrow(ctx);
}
diff --git a/source/pdf/pdf-annot-edit.c b/source/pdf/pdf-annot-edit.c
index 5dbe77ca..9d279a58 100644
--- a/source/pdf/pdf-annot-edit.c
+++ b/source/pdf/pdf-annot-edit.c
@@ -183,7 +183,7 @@ pdf_delete_annot(fz_context *ctx, pdf_page *page, pdf_annot *annot)
* removing it here may break files if multiple pages use the same annot. */
/* And free it. */
- fz_drop_annot(ctx, (fz_annot*)annot);
+ fz_drop_annot(ctx, &annot->super);
doc->dirty = 1;
}
diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c
index d3b294d3..ff878a17 100644
--- a/source/pdf/pdf-annot.c
+++ b/source/pdf/pdf-annot.c
@@ -397,7 +397,7 @@ pdf_drop_annots(fz_context *ctx, pdf_annot *annot)
while (annot)
{
pdf_annot *next = annot->next;
- fz_drop_annot(ctx, (fz_annot*)annot);
+ fz_drop_annot(ctx, &annot->super);
annot = next;
}
}
diff --git a/source/pdf/pdf-graft.c b/source/pdf/pdf-graft.c
index f21e40b7..04bb6b68 100644
--- a/source/pdf/pdf-graft.c
+++ b/source/pdf/pdf-graft.c
@@ -41,7 +41,7 @@ pdf_drop_graft_map(fz_context *ctx, pdf_graft_map *map)
{
if (fz_drop_imp(ctx, map, &map->refs))
{
- fz_drop_document(ctx, (fz_document*)map->src);
+ fz_drop_document(ctx, &map->src->super);
fz_free(ctx, map->dst_from_src);
fz_free(ctx, map);
}