PDF: fix pdf_clone_for_view_only (fixes issue #257)

zeniko · zeniko · commit 22f34002f503 · 2015-10-30T00:13:23.000+01:00
diff --git a/mupdf/source/pdf/pdf-annot.c b/mupdf/source/pdf/pdf-annot.c
@@ -619,7 +619,7 @@ pdf_create_annot_ex(pdf_document *doc, const fz_rect *rect, pdf_obj *base_obj, f
 }
 
 #define ANNOT_OC_VIEW_ONLY \
-	"<< /OCGs << /Usage << /Print << /PrintState /OFF >> /Export << /ExportState /OFF >> >> >> >>"
+	"<< /Type /OCMD /OCGs << /Type /OCG /Usage << /Print << /PrintState /OFF >> /Export << /ExportState /OFF >> >> >> >>"
 
 static pdf_obj *
 pdf_clone_for_view_only(pdf_document *doc, pdf_obj *obj)
@@ -629,6 +629,8 @@ pdf_clone_for_view_only(pdf_document *doc, pdf_obj *obj)
 
 	fz_try(ctx)
 	{
+		if (!doc->ocg)
+			doc->ocg = fz_calloc(doc->ctx, 1, sizeof(*doc->ocg));
 		pdf_dict_puts_drop(obj, "OC", pdf_new_obj_from_str(doc, ANNOT_OC_VIEW_ONLY));
 	}
 	fz_catch(ctx)

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ pdf_create_annot_ex(pdf_document doc, const fz_rect rect, pdf_obj *base_obj, f`
`619`	`619`	`}`
`620`	`620`
`621`	`621`	`#define ANNOT_OC_VIEW_ONLY \`
`622`		`- "<< /OCGs << /Usage << /Print << /PrintState /OFF >> /Export << /ExportState /OFF >> >> >> >>"`
	`622`	`+ "<< /Type /OCMD /OCGs << /Type /OCG /Usage << /Print << /PrintState /OFF >> /Export << /ExportState /OFF >> >> >> >>"`
`623`	`623`
`624`	`624`	`static pdf_obj *`
`625`	`625`	`pdf_clone_for_view_only(pdf_document doc, pdf_obj obj)`
`@@ -629,6 +629,8 @@ pdf_clone_for_view_only(pdf_document doc, pdf_obj obj)`
`629`	`629`
`630`	`630`	`fz_try(ctx)`
`631`	`631`	`{`
	`632`	`+ if (!doc->ocg)`
	`633`	`+ doc->ocg = fz_calloc(doc->ctx, 1, sizeof(*doc->ocg));`
`632`	`634`	`pdf_dict_puts_drop(obj, "OC", pdf_new_obj_from_str(doc, ANNOT_OC_VIEW_ONLY));`
`633`	`635`	`}`
`634`	`636`	`fz_catch(ctx)`