Resolve @facs pointing to <surface>

DDMAL · Jan 9, 2024 · 2f2e538 · 2f2e538
1 parent 162d6df
commit 2f2e538
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/include/vrv/facsimileinterface.h b/include/vrv/facsimileinterface.h
@@ -58,6 +58,13 @@ class FacsimileInterface : public Interface, public AttFacsimile {
     Zone *GetZone() { return m_zone; }
     const Zone *GetZone() const { return m_zone; }
     ///@}
+    ///
+
+    /** Get the surface */
+    ///@{
+    Surface *GetSurface() { return m_surface; }
+    const Surface *GetSurface() const { return m_surface; }
+    ///@}
 
     //-----------------//
     // Pseudo functors //

diff --git a/src/facsimilefunctor.cpp b/src/facsimilefunctor.cpp
@@ -106,9 +106,11 @@ FunctorCode SyncFromFacsimileFunctor::VisitPb(Pb *pb)
     assert(m_currentPage);
 
     Zone *zone = pb->GetZone();
-    assert(zone && zone->GetParent());
-    Surface *surface = (zone->GetParent()->Is(SURFACE)) ? vrv_cast<Surface *>(zone->GetParent()) : NULL;
-    // Use the parent surface attributes if given
+    Surface *surface = pb->GetSurface();
+    if (!surface && zone && zone->GetParent())
+        surface = (zone->GetParent()->Is(SURFACE)) ? vrv_cast<Surface *>(zone->GetParent()) : NULL;
+    assert(zone || surface);
+    // Use the (parent) surface attributes if given
     if (surface && surface->HasLrx() && surface->HasLry()) {
         m_currentPage->m_pageHeight = surface->GetLry() * DEFINITION_FACTOR;
         m_currentPage->m_pageWidth = surface->GetLrx() * DEFINITION_FACTOR;