freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 4679bf8 1/2: Fix C++ compilation.


From: Werner LEMBERG
Subject: [freetype2] master 4679bf8 1/2: Fix C++ compilation.
Date: Sat, 28 Nov 2015 18:18:58 +0000

branch: master
commit 4679bf83a61f7508c2a4043a6d296c9552d3de8d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Fix C++ compilation.
    
    * src/autofit/afloader.c: Include FT_INTERNAL_CALC_H.
    
    * src/truetype/ttgload.c (load_truetype_glyph): Pacify compiler.
---
 ChangeLog              |    8 ++++++++
 src/autofit/afloader.c |    2 ++
 src/truetype/ttgload.c |    2 +-
 3 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee204c2..60f52e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-28  Werner Lemberg  <address@hidden>
+
+       Fix C++ compilation.
+
+       * src/autofit/afloader.c: Include FT_INTERNAL_CALC_H.
+
+       * src/truetype/ttgload.c (load_truetype_glyph): Pacify compiler.
+
 2015-11-28  Nikolaus Waxweiler  <address@hidden>
 
        Change default LCD filter to be normalized and color-balanced.
diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c
index f37530d..aa5b8fd 100644
--- a/src/autofit/afloader.c
+++ b/src/autofit/afloader.c
@@ -23,6 +23,8 @@
 #include "afmodule.h"
 #include "afpic.h"
 
+#include FT_INTERNAL_CALC_H
+
 
   /* Initialize glyph loader. */
 
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index c9d5716..d94fc92 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -1659,7 +1659,7 @@
       }
       else
       {
-        FT_ListNode  node;
+        FT_ListNode  node = NULL;
 
 
         if ( FT_NEW( node ) )



reply via email to

[Prev in Thread] Current Thread [Next in Thread]