r18083 by jghali - #11368: Isolate Freetype #include

[scribus-commit]

Author: jghali
Date: Fri Jan 11 23:14:05 2013
New Revision: 18083

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18083
Log:
#11368: Isolate Freetype #include

Modified:
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/scfonts.h
    trunk/Scribus/scribus/scimgdataloader_ps.cpp
    trunk/Scribus/scribus/scribusdoc.h

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18083&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp (original)
+++ trunk/Scribus/scribus/scfonts.cpp Fri Jan 11 23:14:05 2013
@@ -49,6 +49,11 @@
 #ifdef HAVE_FONTCONFIG
 #include <fontconfig/fontconfig.h>
 #endif
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_OUTLINE_H
+#include FT_GLYPH_H
 
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_TABLES_H

Modified: trunk/Scribus/scribus/scfonts.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18083&path=/trunk/Scribus/scribus/scfonts.h
==============================================================================
--- trunk/Scribus/scribus/scfonts.h (original)
+++ trunk/Scribus/scribus/scfonts.h Fri Jan 11 23:14:05 2013
@@ -15,18 +15,13 @@
 #include <QString>
 #include <QStringList>
 
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_OUTLINE_H
-#include FT_GLYPH_H
-
-FT_Error ftIOFunc( FT_Stream fts, unsigned long offset, unsigned char* buffer, unsigned long count);
-
 #include "fonts/scface.h"
 #include "fpointarray.h"
 #include "scconfig.h"
 #include "scribusapi.h"
 
+/* Forward declaration so we don't have to include all of Freetype. */
+typedef struct FT_LibraryRec_  *FT_Library;
 
 class ScribusDoc;
 

Modified: trunk/Scribus/scribus/scimgdataloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18083&path=/trunk/Scribus/scribus/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_ps.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_ps.cpp Fri Jan 11 23:14:05 2013
@@ -33,6 +33,7 @@
 #endif
 #include <jpeglib.h>
 #include <jerror.h>
+#include <csetjmp>
 #undef HAVE_STDLIB_H
 #ifdef const
 #  undef const          // remove crazy C hackery in jconfig.h

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18083&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Fri Jan 11 23:14:05 2013
@@ -61,9 +61,6 @@
 #include "undostate.h"
 #include "updatemanager.h"
 #include "usertaskstructs.h"
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
 
 class DocUpdater;
 class FPoint;