Switch annotation flattening to use the form xobjects

Instead of directly putting the contents of the annotation appearance
streams into the page's content stream, add commands to render the
form xobjects directly. This is a more robust way to do it than the
original solution as it works properly with patterns and avoids
problems with resource name clashes between the pages and the form
xobjects.

1 files changed, 6 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b974fa5..ec5d9ec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2018-12-31  Jay Berkenbilt  <ejb@ql.org>
 
-	* Add several methods for flattening form fields and annotations:
+	* Add methods for flattening form fields and annotations:
 	  - QPDFPageDocumentHelper::flattenAnnotations - integrate
 	    annotation appearance streams into page contents with special
 	    handling for form fields: if appearance streams are up to date
@@ -11,15 +11,11 @@
 	    be found.
 	  - QPDFAnnotationObjectHelper::getPageContentForAppearance -
 	    generate the content stream fragment to render an appearance
-	    stream in a page's content stream. Called by flattenAnnotations.
-	  - QPDFAnnotationObjectHelper::getAnnotationAppearanceMatrix -
-	    calculate the matrix that will transform from the appearance
-	    stream coordinates to the page coordinates. Called by
-	    getPageContentForAppearance.
-
-	* Add method QPDFObjectHandle::mergeDictionary(), which
-	recursively merges dictionaries with semantics designed for
-	merging resource dictionaries. See detailed description in
+	    stream in a page's content stream as a form xobject. Called by
+	    flattenAnnotations.
+
+	* Add method QPDFObjectHandle::mergeResources(), which merges
+	resource dictionaries. See detailed description in
 	QPDFObjectHandle.hh.
 
 	* Add QPDFObjectHandle::Matrix, similar to