From 5db39a681a2cc9caf3abf52687478b9a9c9ac8fc Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 22 Jun 2018 16:49:26 -0400
Subject: Windows fixes

---
 include/qpdf/QPDFAcroFormDocumentHelper.hh | 2 ++
 include/qpdf/QPDFAnnotationObjectHelper.hh | 2 ++
 include/qpdf/QPDFDocumentHelper.hh         | 4 ++++
 include/qpdf/QPDFFormFieldObjectHelper.hh  | 3 +++
 include/qpdf/QPDFObjectHelper.hh           | 4 ++++
 include/qpdf/QPDFPageDocumentHelper.hh     | 2 ++
 include/qpdf/QPDFPageObjectHelper.hh       | 2 ++
 7 files changed, 19 insertions(+)

(limited to 'include')

diff --git a/include/qpdf/QPDFAcroFormDocumentHelper.hh b/include/qpdf/QPDFAcroFormDocumentHelper.hh
index 2aa0d377..519f626b 100644
--- a/include/qpdf/QPDFAcroFormDocumentHelper.hh
+++ b/include/qpdf/QPDFAcroFormDocumentHelper.hh
@@ -83,6 +83,7 @@
 class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper
 {
   public:
+    QPDF_DLL
     QPDFAcroFormDocumentHelper(QPDF&);
 
     // This class lazily creates an internal cache of the mapping
@@ -163,6 +164,7 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper
         friend class QPDFAcroFormDocumentHelper;
 
       public:
+        QPDF_DLL
         ~Members();
 
       private:
diff --git a/include/qpdf/QPDFAnnotationObjectHelper.hh b/include/qpdf/QPDFAnnotationObjectHelper.hh
index d64388da..a5bb5a0d 100644
--- a/include/qpdf/QPDFAnnotationObjectHelper.hh
+++ b/include/qpdf/QPDFAnnotationObjectHelper.hh
@@ -29,6 +29,7 @@
 class QPDFAnnotationObjectHelper: public QPDFObjectHelper
 {
   public:
+    QPDF_DLL
     QPDFAnnotationObjectHelper(QPDFObjectHandle);
 
     // This class provides helper methods for certain types of
@@ -73,6 +74,7 @@ class QPDFAnnotationObjectHelper: public QPDFObjectHelper
         friend class QPDFPageObjectHelper;
 
       public:
+        QPDF_DLL
         ~Members();
 
       private:
diff --git a/include/qpdf/QPDFDocumentHelper.hh b/include/qpdf/QPDFDocumentHelper.hh
index 72e4a463..3b180743 100644
--- a/include/qpdf/QPDFDocumentHelper.hh
+++ b/include/qpdf/QPDFDocumentHelper.hh
@@ -45,6 +45,10 @@ class QPDFDocumentHelper
     {
     }
     QPDF_DLL
+    virtual ~QPDFDocumentHelper()
+    {
+    }
+    QPDF_DLL
     QPDF& getQPDF()
     {
         return this->qpdf;
diff --git a/include/qpdf/QPDFFormFieldObjectHelper.hh b/include/qpdf/QPDFFormFieldObjectHelper.hh
index c22703aa..4654d956 100644
--- a/include/qpdf/QPDFFormFieldObjectHelper.hh
+++ b/include/qpdf/QPDFFormFieldObjectHelper.hh
@@ -33,7 +33,9 @@
 class QPDFFormFieldObjectHelper: public QPDFObjectHelper
 {
   public:
+    QPDF_DLL
     QPDFFormFieldObjectHelper();
+    QPDF_DLL
     QPDFFormFieldObjectHelper(QPDFObjectHandle);
 
     QPDF_DLL
@@ -143,6 +145,7 @@ class QPDFFormFieldObjectHelper: public QPDFObjectHelper
         friend class QPDFFormFieldObjectHelper;
 
       public:
+        QPDF_DLL
         ~Members();
 
       private:
diff --git a/include/qpdf/QPDFObjectHelper.hh b/include/qpdf/QPDFObjectHelper.hh
index d5ad96ed..8aec8955 100644
--- a/include/qpdf/QPDFObjectHelper.hh
+++ b/include/qpdf/QPDFObjectHelper.hh
@@ -46,6 +46,10 @@ class QPDFObjectHelper
     {
     }
     QPDF_DLL
+    virtual ~QPDFObjectHelper()
+    {
+    }
+    QPDF_DLL
     QPDFObjectHandle getObjectHandle()
     {
         return this->oh;
diff --git a/include/qpdf/QPDFPageDocumentHelper.hh b/include/qpdf/QPDFPageDocumentHelper.hh
index 5847e078..514f7277 100644
--- a/include/qpdf/QPDFPageDocumentHelper.hh
+++ b/include/qpdf/QPDFPageDocumentHelper.hh
@@ -34,6 +34,7 @@
 class QPDFPageDocumentHelper: public QPDFDocumentHelper
 {
   public:
+    QPDF_DLL
     QPDFPageDocumentHelper(QPDF&);
 
     // Traverse page tree, and return all /Page objects wrapped in
@@ -85,6 +86,7 @@ class QPDFPageDocumentHelper: public QPDFDocumentHelper
         friend class QPDFPageDocumentHelper;
 
       public:
+        QPDF_DLL
         ~Members();
 
       private:
diff --git a/include/qpdf/QPDFPageObjectHelper.hh b/include/qpdf/QPDFPageObjectHelper.hh
index 570e81b4..08a7d8ab 100644
--- a/include/qpdf/QPDFPageObjectHelper.hh
+++ b/include/qpdf/QPDFPageObjectHelper.hh
@@ -32,6 +32,7 @@
 class QPDFPageObjectHelper: public QPDFObjectHelper
 {
   public:
+    QPDF_DLL
     QPDFPageObjectHelper(QPDFObjectHandle);
 
     // Returns an empty map if there are no images or no resources.
@@ -141,6 +142,7 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
         friend class QPDFPageObjectHelper;
 
       public:
+        QPDF_DLL
         ~Members();
 
       private:
-- 
cgit v1.2.3-54-g00ecf