From e5b59cacbb7ed6bcefe25d736a315753dd764594 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Fri, 9 Jan 2015 11:46:17 -0800
Subject: merge to XFA: Fix -Wnon-virtual-dtor compiler warnings.

Original at URL: https://codereview.chromium.org/810883005

Note that the new code in XFA introduces many more of these, to be handled
separately.

TBR=brucedawson@chromium.org
TBR=thestig@chromium.org

BUG=https://code.google.com/p/pdfium/issues/detail?id=102

Review URL: https://codereview.chromium.org/842223004
---
 core/src/fpdfapi/fpdf_font/ttgsubtable.cpp | 2 +-
 core/src/fpdfapi/fpdf_font/ttgsubtable.h   | 5 +++++
 core/src/fpdfdoc/tagged_int.h              | 9 ++++++---
 core/src/fxcodec/jbig2/JBig2_Module.h      | 1 +
 core/src/fxcrt/fx_arabic.h                 | 4 +++-
 5 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'core/src')

diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
index 42f77de57b..e317aa67fd 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp
@@ -446,7 +446,7 @@ IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont)
         if (pGsubTable->m_GsubImp.LoadGSUBTable((FT_Bytes)pFont->m_pGsubData)) {
             return pGsubTable;
         }
-        delete pGsubTable;
+        pGsubTable->Release();
     }
     return NULL;
 }
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
index c381a01304..6b1b4f2443 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
@@ -414,6 +414,11 @@ public:
         delete this;
     }
     virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) FX_OVERRIDE;
+
     CFX_CTTGSUBTable m_GsubImp;
+
+private:
+    ~CFX_GSUBTable() { }
 };
 #endif
+
diff --git a/core/src/fpdfdoc/tagged_int.h b/core/src/fpdfdoc/tagged_int.h
index d190db6427..7efd682887 100644
--- a/core/src/fpdfdoc/tagged_int.h
+++ b/core/src/fpdfdoc/tagged_int.h
@@ -6,7 +6,9 @@
 
 #ifndef _FPDF_TAGGED_INT_H_
 #define _FPDF_TAGGED_INT_H_
-class CPDF_StructTreeImpl;
+
+#include "../../include/fpdfdoc/fpdf_tagged.h"
+
 class CPDF_StructElementImpl;
 class CPDF_StructTreeImpl : public CPDF_StructTree
 {
@@ -36,7 +38,6 @@ class CPDF_StructElementImpl FX_FINAL : public CPDF_StructElement
 {
 public:
     CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree, CPDF_StructElementImpl* pParent, CPDF_Dictionary* pDict);
-    ~CPDF_StructElementImpl();
     CPDF_StructTree*		GetTree() const
     {
         return m_pTree;
@@ -79,13 +80,15 @@ public:
     CPDF_StructElementImpl*	Retain();
     void					Release();
 protected:
+    ~CPDF_StructElementImpl();
+
     CPDF_StructTreeImpl*	m_pTree;
     CFX_ByteString			m_Type;
     CPDF_StructElementImpl*	m_pParent;
     CPDF_Dictionary*		m_pDict;
     CFX_ArrayTemplate<CPDF_StructKid>	m_Kids;
-
     int			m_RefCount;
+
     friend class CPDF_StructTreeImpl;
 };
 #endif
diff --git a/core/src/fxcodec/jbig2/JBig2_Module.h b/core/src/fxcodec/jbig2/JBig2_Module.h
index 3a01eb094c..711cf4047b 100644
--- a/core/src/fxcodec/jbig2/JBig2_Module.h
+++ b/core/src/fxcodec/jbig2/JBig2_Module.h
@@ -10,6 +10,7 @@
 class CJBig2_Module
 {
 public:
+    virtual ~CJBig2_Module() { }
 
     virtual void *JBig2_Malloc(FX_DWORD dwSize) = 0;
 
diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h
index e44bfb8142..f55f7c60cf 100644
--- a/core/src/fxcrt/fx_arabic.h
+++ b/core/src/fxcrt/fx_arabic.h
@@ -195,7 +195,9 @@ public:
     virtual FX_BOOL		EndChar() FX_OVERRIDE;
     virtual FX_INT32	GetBidiInfo(FX_INT32 &iStart, FX_INT32 &iCount) FX_OVERRIDE;
     virtual void		Reset() FX_OVERRIDE;
-protected:
+
+private:
+    ~CFX_BidiChar() { }
     FX_BOOL		m_bSeparateNeutral;
     FX_INT32	m_iCurStart;
     FX_INT32	m_iCurCount;
-- 
cgit v1.2.3