[Lasi-svn] SF.net SVN: lasi:[182] trunk

[<ai...@us...>]

Revision: 182
          http://sourceforge.net/p/lasi/code/182
Author:   airwin
Date:     2014-04-27 22:27:37 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
Include Freetype headers in recommended way.  This change should fix
<https://sourceforge.net/p/lasi/bugs/2/>.  The change goes a bit
beyond the macports patch for the problem linked in that bug report
which was incomplete. (I searched for all occurrences of #include and
freetype in the code base and changed to the standard form.)

Tested on Linux with Freetype version 2.4.9 which implies this change
does not disrupt anything for that Freetype version.  A further test
for Freetype version 2.5.1 (which previously could not be used with
libLASi because of the non-standard #includes in the old version
of that code) has been requested.

Modified Paths:
--------------
    trunk/include/LASi.h
    trunk/src/drawGlyph.cpp
    trunk/src/drawGlyph.h
    trunk/src/glyphMgr.cpp
    trunk/src/glyphMgr.h
    trunk/src/util.cpp
    trunk/src/util.h

Modified: trunk/include/LASi.h
===================================================================
--- trunk/include/LASi.h	2014-04-27 21:33:38 UTC (rev 181)
+++ trunk/include/LASi.h	2014-04-27 22:27:37 UTC (rev 182)
@@ -11,7 +11,8 @@
 #include <sstream>
 #include <map>
 #include <pango/pango.h>
-#include <freetype/ftglyph.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
 
 class FreetypeGlyphMgr;
 class ContextMgr;

Modified: trunk/src/drawGlyph.cpp
===================================================================
--- trunk/src/drawGlyph.cpp	2014-04-27 21:33:38 UTC (rev 181)
+++ trunk/src/drawGlyph.cpp	2014-04-27 22:27:37 UTC (rev 182)
@@ -6,7 +6,8 @@
  */
 
 #include <ostream>
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_OUTLINE_H
 #include <algorithm>
 #include <LASi.h>
 #include <config.h>

Modified: trunk/src/drawGlyph.h
===================================================================
--- trunk/src/drawGlyph.h	2014-04-27 21:33:38 UTC (rev 181)
+++ trunk/src/drawGlyph.h	2014-04-27 22:27:37 UTC (rev 182)
@@ -10,7 +10,8 @@
 
 #include <iostream>
 #include <pango/pango.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 /** Generate the Postscript commands to draw the glyph
   * using the font in pPangoCtx.

Modified: trunk/src/glyphMgr.cpp
===================================================================
--- trunk/src/glyphMgr.cpp	2014-04-27 21:33:38 UTC (rev 181)
+++ trunk/src/glyphMgr.cpp	2014-04-27 22:27:37 UTC (rev 182)
@@ -10,9 +10,8 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include FT_GLYPH_H
 
-#include <freetype/ftglyph.h>
-
 #include <cassert>
 #include "util.h"
 #include "glyphMgr.h"

Modified: trunk/src/glyphMgr.h
===================================================================
--- trunk/src/glyphMgr.h	2014-04-27 21:33:38 UTC (rev 181)
+++ trunk/src/glyphMgr.h	2014-04-27 22:27:37 UTC (rev 182)
@@ -15,9 +15,8 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include FT_GLYPH_H
 
-#include <freetype/ftglyph.h>
-
 /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
  */
 class FreetypeGlyphMgr { //: public Manager<FT_GlyphRec*> {

Modified: trunk/src/util.cpp
===================================================================
--- trunk/src/util.cpp	2014-04-27 21:33:38 UTC (rev 181)
+++ trunk/src/util.cpp	2014-04-27 22:27:37 UTC (rev 182)
@@ -11,7 +11,6 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-//#include <freetype/freetype.h>
 
 using namespace std;
 

Modified: trunk/src/util.h
===================================================================
--- trunk/src/util.h	2014-04-27 21:33:38 UTC (rev 181)
+++ trunk/src/util.h	2014-04-27 22:27:37 UTC (rev 182)
@@ -18,7 +18,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#include <freetype/ftglyph.h>
+#include FT_GLYPH_H
 
 std::ostream& operator<<(std::ostream&, const FT_Library);
 std::ostream& operator<<(std::ostream&, const FT_Face);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.