[Libreoffice-commits] core.git: vcl/source

[Stephan Bergmann]

 vcl/source/fontsubset/ttcr.cxx |    5 +++--
 vcl/source/fontsubset/ttcr.hxx |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 5f98904df8e2f8845689cf5c5e1880c2c45e0454
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 31 13:03:36 2015 +0200

    -fsanitize=function
    
    Change-Id: I47bb1acebf409f0d391a06ca7a7399d8654ff143

diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index d4aa5a6..a223039 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -203,7 +203,7 @@ void TrueTypeCreatorNewEmpty(sal_uInt32 tag, TrueTypeCreator **_this)
     TrueTypeCreator* ptr = static_cast<TrueTypeCreator*>(smalloc(sizeof(TrueTypeCreator)));
 
     ptr->tables = listNewEmpty();
-    listSetElementDtor(ptr->tables, reinterpret_cast<list_destructor>(TrueTypeTableDispose));
+    listSetElementDtor(ptr->tables, TrueTypeTableDispose);
 
     ptr->tag = tag;
 
@@ -1502,8 +1502,9 @@ extern "C"
     /**
      * Destructor for the TrueTypeTable object.
      */
-     void TrueTypeTableDispose(vcl::TrueTypeTable *_this)
+     void TrueTypeTableDispose(void * arg)
     {
+        vcl::TrueTypeTable *_this = static_cast<vcl::TrueTypeTable *>(arg);
         /* XXX do a binary search */
         unsigned int i;
 
diff --git a/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx
index e2ee3c4..ab4b2f3 100644
--- a/vcl/source/fontsubset/ttcr.hxx
+++ b/vcl/source/fontsubset/ttcr.hxx
@@ -219,7 +219,7 @@ extern "C"
 /**
  * Destructor for the TrueTypeTable object.
  */
- void TrueTypeTableDispose(vcl::TrueTypeTable *);
+ void TrueTypeTableDispose(void *);
 
 /**
  * TrueTypeCreator destructor. It calls destructors for all TrueTypeTables added to it.