From e0c2ee1d37c0f213f22a04df71710bebe3526f85 Mon Sep 17 00:00:00 2001
From: lordjaxom <lordjaxom>
Date: Wed, 2 Jun 2004 19:56:58 +0000
Subject: - implemented image loading through ImageMagick (fixes crashes when
 running   together with GraphTFT) - implemented Theme support (see file
 demo.colors in the demo skin) - implemented translations for texts used in
 skins (see file demo.trans in the   demo skin)

---
 font.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'font.h')

diff --git a/font.h b/font.h
index 327c6ac..dfc007f 100644
--- a/font.h
+++ b/font.h
@@ -1,17 +1,15 @@
 /*
- * $Id: font.h,v 1.3 2004/05/29 00:27:22 lordjaxom Exp $
+ * $Id: font.h,v 1.4 2004/06/02 20:43:05 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_FREETYPE_H
 #define VDR_TEXT2SKIN_FREETYPE_H
 
+#include "common.h"
+#include "data.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include <string>
-using std::string;
-
-#include "data.h"
 
 // kannst noch einbauen, dass er die fonts "fontOsd" "fontSml" und "fontFix" aus VDR statt aus freetype nimmt
 
-- 
cgit v1.2.3