[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source

[Herbert Dürr]

 vcl/source/glyphs/graphite_adaptors.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit fbf086027e3595a2803a1489db80fb81c0b8f15a
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Mar 11 07:49:24 2014 +0000

    #i124394# fix inclusion of freetype's ftsynth.h header
    
    the location of this header file changed with freetype 2.51 so we had to adapt.
    On the other hand the header is not actually needed because we load the symbols
    for synthetization of outlines dynamically to be compatible with freetype libs
    that don't support them. So we can remove the header inclusion.
    
    Found-by: Ariel Costenla-Haile <ariel at apache.org>
    Patch-by: Herbert Duerr <hdu at apache.org>

diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx
index 279d8fb..dcdac7b 100644
--- a/vcl/source/glyphs/graphite_adaptors.cxx
+++ b/vcl/source/glyphs/graphite_adaptors.cxx
@@ -42,14 +42,10 @@
 // Platform
 #ifndef WNT
 #include <unx/saldisp.hxx>
-
 #include <salgdi.hxx>
 
-#include <freetype2/ftsynth.h>
-
 // Module
 #include "gcach_ftyp.hxx"
-
 #include <graphite_features.hxx>
 #include <graphite_adaptors.hxx>