Remove unused pdf_comment struct and add textspan and displaylist fields to the page struct.

3 files changed, 11 insertions, 34 deletions

diff --git a/mupdf/mupdf.h b/mupdf/mupdf.h
index 95f54d97..a0b3155f 100644
--- a/mupdf/mupdf.h
+++ b/mupdf/mupdf.h
@@ -483,8 +483,6 @@ void pdf_debugfont(pdf_fontdesc *fontdesc);
  */
 
 typedef struct pdf_link_s pdf_link;
-typedef struct pdf_comment_s pdf_comment;
-typedef struct pdf_widget_s pdf_widget;
 typedef struct pdf_outline_s pdf_outline;
 
 typedef enum pdf_linkkind_e
@@ -501,30 +499,6 @@ struct pdf_link_s
 	pdf_link *next;
 };
 
-typedef enum pdf_commentkind_e
-{
-	PDF_CTEXT,
-	PDF_CFREETEXT,
-	PDF_CLINE,
-	PDF_CSQUARE,
-	PDF_CCIRCLE,
-	PDF_CPOLYGON,
-	PDF_CPOLYLINE,
-	PDF_CMARKUP,
-	PDF_CCARET,
-	PDF_CSTAMP,
-	PDF_CINK
-} pdf_commentkind;
-
-struct pdf_comment_s
-{
-	pdf_commentkind kind;
-	fz_rect rect;
-	fz_rect popup;
-	fz_obj *contents;
-	pdf_comment *next;
-};
-
 struct pdf_outline_s
 {
 	char *title;
@@ -544,7 +518,7 @@ pdf_outline *pdf_loadoutline(pdf_xref *xref);
 void pdf_debugoutline(pdf_outline *outline, int level);
 void pdf_freeoutline(pdf_outline *outline);
 
-void pdf_loadannots(pdf_comment **, pdf_link **, pdf_xref *, fz_obj *annots);
+void pdf_loadannots(pdf_link **, pdf_xref *, fz_obj *annots);
 
 /*
  * Page tree, pages and related objects
@@ -558,7 +532,8 @@ struct pdf_page_s
 	int rotate;
 	fz_obj *resources;
 	fz_buffer *contents;
-	pdf_comment *comments;
+	fz_displaylist *list;
+	fz_textspan *text;
 	pdf_link *links;
 };
 
diff --git a/mupdf/pdf_annot.c b/mupdf/pdf_annot.c
index 70ae1360..b0e75dd5 100644
--- a/mupdf/pdf_annot.c
+++ b/mupdf/pdf_annot.c
@@ -114,15 +114,13 @@ pdf_loadlink(pdf_xref *xref, fz_obj *dict)
 }
 
 void
-pdf_loadannots(pdf_comment **cp, pdf_link **lp, pdf_xref *xref, fz_obj *annots)
+pdf_loadannots(pdf_link **lp, pdf_xref *xref, fz_obj *annots)
 {
-	pdf_comment *comment;
 	pdf_link *link;
 	fz_obj *subtype;
 	fz_obj *obj;
 	int i;
 
-	comment = nil;
 	link = nil;
 
 	pdf_logpage("load annotations {\n");
@@ -145,7 +143,6 @@ pdf_loadannots(pdf_comment **cp, pdf_link **lp, pdf_xref *xref, fz_obj *annots)
 
 	pdf_logpage("}\n");
 
-	*cp = comment;
 	*lp = link;
 }
 
diff --git a/mupdf/pdf_page.c b/mupdf/pdf_page.c
index e629d110..d39fad83 100644
--- a/mupdf/pdf_page.c
+++ b/mupdf/pdf_page.c
@@ -82,7 +82,8 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
 	page = fz_malloc(sizeof(pdf_page));
 	page->resources = nil;
 	page->contents = nil;
-	page->comments = nil;
+	page->list = nil;
+	page->text = nil;
 	page->links = nil;
 
 	obj = fz_dictgets(dict, "MediaBox");
@@ -112,7 +113,7 @@ pdf_loadpage(pdf_page **pagep, pdf_xref *xref, fz_obj *dict)
 
 	obj = fz_dictgets(dict, "Annots");
 	if (obj)
-		pdf_loadannots(&page->comments, &page->links, xref, obj);
+		pdf_loadannots(&page->links, xref, obj);
 
 	page->resources = fz_dictgets(dict, "Resources");
 	if (page->resources)
@@ -140,6 +141,10 @@ pdf_freepage(pdf_page *page)
 		fz_dropobj(page->resources);
 	if (page->contents)
 		fz_dropbuffer(page->contents);
+	if (page->list)
+		fz_freedisplaylist(page->list);
+	if (page->text)
+		fz_freetextspan(page->text);
 	if (page->links)
 		pdf_freelink(page->links);
 	fz_free(page);