Fix issue with patterns in templates

If draw or fill patterns are used in templates they need to be registered with the template. Pattern references were missing from templates.
utelle · Sep 10, 2021 · 5446eec · 5446eec
1 parent af8df8a
commit 5446eec
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/include/wx/pdftemplate.h b/include/wx/pdftemplate.h
@@ -81,6 +81,7 @@ class WXDLLIMPEXP_PDFDOC wxPdfTemplate
   wxPdfImageHashMap*   m_images;            ///< array of used images
   wxPdfTemplatesMap*   m_templates;         ///< array of templates
   wxPdfExtGStateMap*   m_extGStates;        ///< array of extended graphics states
+  wxPdfPatternMap*     m_patterns;          ///< array of patterns
 
   wxPdfParser*         m_parser;            ///< Associated parser
   wxPdfObject*         m_resources;         ///< Array of page resource objects

diff --git a/src/pdfdocument.cpp b/src/pdfdocument.cpp
@@ -2557,6 +2557,10 @@ wxPdfDocument::SetDrawPattern(const wxString& name)
     {
       OutAscii(m_drawColour.GetColour(true));
     }
+    if (m_inTemplate)
+    {
+      (*(m_currentTemplate->m_patterns))[pattern->first] = pattern->second;
+    }
   }
   else
   {
@@ -2652,6 +2656,10 @@ wxPdfDocument::SetFillPattern(const wxString& name)
     {
       OutAscii(m_fillColour.GetColour(false));
     }
+    if (m_inTemplate)
+    {
+      (*(m_currentTemplate->m_patterns))[pattern->first] = pattern->second;
+    }
   }
   else
   {

diff --git a/src/pdfkernel.cpp b/src/pdfkernel.cpp
@@ -1843,6 +1843,17 @@ wxPdfDocument::PutTemplates()
         }
         Out(">>");
       }
+      // References to patterns
+      if (currentTemplate->m_patterns->size() > 0)
+      {
+        Out("/Pattern <<");
+        wxPdfPatternMap::iterator pattern;
+        for (pattern = currentTemplate->m_patterns->begin(); pattern != currentTemplate->m_patterns->end(); pattern++)
+        {
+          OutAscii(wxString::Format(wxS("/P%d %d 0 R"), pattern->second->GetIndex(), pattern->second->GetObjIndex()));
+        }
+        Out(">>");
+      }
       Out(">>");
     }
 
@@ -2424,10 +2435,10 @@ wxPdfDocument::PutResources()
   PutShaders();
   PutFonts();
   PutImages();
+  PutPatterns();
   PutTemplates();
   PutImportedObjects();
   PutSpotColours();
-  PutPatterns();
   PutLayers();
 
   // Resource dictionary

diff --git a/src/pdftemplate.cpp b/src/pdftemplate.cpp
@@ -35,6 +35,7 @@ wxPdfTemplate::wxPdfTemplate(int templateId)
   m_images     = new wxPdfImageHashMap();
   m_templates  = new wxPdfTemplatesMap();
   m_extGStates = new wxPdfExtGStateMap();
+  m_patterns   = new wxPdfPatternMap();
 
   m_parser    = NULL;
   m_resources = NULL;
@@ -47,6 +48,7 @@ wxPdfTemplate::~wxPdfTemplate()
   delete m_images;
   delete m_templates;
   delete m_extGStates;
+  delete m_patterns;
 
   if (m_resources != NULL)
   {