summaryrefslogtreecommitdiff
path: root/pdf/pdf_annot.c
diff options
context:
space:
mode:
authorPaul Gardiner <paulg.artifex@glidos.net>2012-08-08 14:03:34 +0100
committerPaul Gardiner <paulg.artifex@glidos.net>2012-08-08 14:03:34 +0100
commit274ab2d66943bb891976ef712a816e7d128eff22 (patch)
treebee912b4426f3dfe4acc176a57fd5b55db58d53c /pdf/pdf_annot.c
parent51661f29a5f229f30ae16e16bd0ef6396cd001af (diff)
parent511ea75a53db6e72334438bcda2ce774c7d72d1e (diff)
downloadmupdf-274ab2d66943bb891976ef712a816e7d128eff22.tar.xz
Merge branch 'master' into forms
Conflicts: Makefile apps/mudraw.c pdf/pdf_write.c win32/libmupdf-v8.vcproj
Diffstat (limited to 'pdf/pdf_annot.c')
-rw-r--r--pdf/pdf_annot.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c
index fc436409..5a463336 100644
--- a/pdf/pdf_annot.c
+++ b/pdf/pdf_annot.c
@@ -320,8 +320,7 @@ pdf_free_annot(fz_context *ctx, pdf_annot *annot)
next = annot->next;
if (annot->ap)
pdf_drop_xobject(ctx, annot->ap);
- if (annot->obj)
- pdf_drop_obj(annot->obj);
+ pdf_drop_obj(annot->obj);
fz_free(ctx, annot);
annot = next;
}