patch 7.4.1428

Problem:    Compiler warning for non-virtual destructor.
Solution:   Make it virtual. (Yasuhiro Matsumoto)

diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp
index 08b81c44701a6c1b044dffabb275b9b17573a674..07685eb09bf29d2e0f5e4e2c930ee7159eac1a6f 100644 (file)
--- a/src/gui_dwrite.cpp
+++ b/src/gui_dwrite.cpp
@@ -237,7 +237,8 @@ public:
        AddRef();
     }
 
-    ~GdiTextRenderer()
+    // add "virtual" to avoid a compiler warning
+    virtual ~GdiTextRenderer()
     {
        SafeRelease(&pRenderTarget_);
        SafeRelease(&pRenderingParams_);
@@ -255,7 +256,7 @@ public:
        __maybenull void* clientDrawingContext,
        __out DWRITE_MATRIX* transform)
     {
-       //forward the render target's transform
+       // forward the render target's transform
        pRenderTarget_->GetCurrentTransform(transform);
        return S_OK;
     }

diff --git a/src/version.c b/src/version.c
index 359d8df3be490fab2aa23a6f2b0e3818218c9353..68ccf928024df08d7eb4bbf2b38422bd56ec40fa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1428,
 /**/
     1427,
 /**/