svn commit: r1585412 - in /openoffice/branches/AOO410: ./ main/ main/vcl/source/glyphs/graphite_adaptors.cxx

[hd...@apache.org]

Author: hdu
Date: Mon Apr  7 07:11:31 2014
New Revision: 1585412

URL: http://svn.apache.org/r1585412
Log:
#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 the ftsynth.h header doesn't need inclusion at all.

Modified:
    openoffice/branches/AOO410/   (props changed)
    openoffice/branches/AOO410/main/   (props changed)
    openoffice/branches/AOO410/main/vcl/source/glyphs/graphite_adaptors.cxx

Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
  Merged /openoffice/trunk:r1575922,1576216

Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/main:r1575922,1576216

Modified: openoffice/branches/AOO410/main/vcl/source/glyphs/graphite_adaptors.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/vcl/source/glyphs/graphite_adaptors.cxx?rev=1585412&r1=1585411&r2=1585412&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/vcl/source/glyphs/graphite_adaptors.cxx (original)
+++ openoffice/branches/AOO410/main/vcl/source/glyphs/graphite_adaptors.cxx Mon Apr  7 07:11:31 2014
@@ -42,14 +42,10 @@
 // Platform
 #ifndef WNT
 #include <unx/saldisp.hxx>
-
 #include <salgdi.hxx>
 
-#include <freetype/ftsynth.h>
-
 // Module
 #include "gcach_ftyp.hxx"
-
 #include <graphite_features.hxx>
 #include <graphite_adaptors.hxx>