X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Ffont.cpp;h=3b5ca946b30ae6bc0d21d124e9415119f7260625;hp=a5db43a9e3af99765f12ae4e91d933c5d38c1899;hb=6d3b397a9316337447f2ebfcd66c01abec54b4e8;hpb=9ec5fc545cfff7addbfd5b50ee9d6d60ab419e0d

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index a5db43a..3b5ca94 100644
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -15,12 +15,10 @@
 // use this for init Freetype...
 #include <ft2build.h>
 #include FT_FREETYPE_H
-#ifdef HAVE_FREETYPE2
 #define FTC_Image_Cache_New(a,b)	FTC_ImageCache_New(a,b)
 #define FTC_Image_Cache_Lookup(a,b,c,d)	FTC_ImageCache_Lookup(a,b,c,d,NULL)
 #define FTC_SBit_Cache_New(a,b)		FTC_SBitCache_New(a,b)
 #define FTC_SBit_Cache_Lookup(a,b,c,d)	FTC_SBitCache_Lookup(a,b,c,d,NULL)
-#endif
 
 #include <lib/base/eerror.h>
 #include <lib/gdi/lcd.h>
@@ -42,10 +40,6 @@ fontRenderClass *fontRenderClass::instance;
 
 static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
 
-#ifndef HAVE_FREETYPE2
-static FTC_Font cache_current_font=0;
-#endif
-
 struct fntColorCacheKey
 {
 	gRGB start, end;
@@ -210,12 +204,8 @@ float fontRenderClass::getLineHeight(const gFont& font)
 		return 0;
 	singleLock s(ftlock);
 	FT_Face current_face;
-#ifdef HAVE_FREETYPE2
 	if ((FTC_Manager_LookupFace(cacheManager, fnt->scaler.face_id, &current_face) < 0) ||
 	    (FTC_Manager_LookupSize(cacheManager, &fnt->scaler, &fnt->size) < 0))
-#else
-	if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, &current_face, &fnt->size)<0)
-#endif
 	{
 		eDebug("FTC_Manager_Lookup_Size failed!");
 		return 0;
@@ -263,7 +253,6 @@ DEFINE_REF(Font);
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
 	renderer=render;
-#ifdef HAVE_FREETYPE2
 	font.face_id = faceid;
 	font.width = isize;
 	font.height = isize;
@@ -272,12 +261,6 @@ Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwi
 	scaler.width = isize;
 	scaler.height = isize;
 	scaler.pixel = 1;
-#else
-	font.font.face_id=faceid;
-	font.font.pix_width	= isize;
-	font.font.pix_height = isize;
-	font.image_type = ftc_image_grays;
-#endif
 	height=isize;
 	if (tabwidth==-1)
 		tabwidth=8*isize;
@@ -474,18 +457,12 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
 			// we ask for replacment_font first becauseof the cache
 	if (replacement_font)
 	{
-#ifdef HAVE_FREETYPE2
 		if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
 					    replacement_font->scaler.face_id,
 					    &replacement_face) < 0) ||
 		    (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
 					    &replacement_font->scaler,
 					    &replacement_font->size) < 0))
-#else
-		if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, 
-				&replacement_font->font.font, &replacement_face, 
-				&replacement_font->size)<0)
-#endif
 		{
 			eDebug("FTC_Manager_Lookup_Size failed!");
 			return;
@@ -493,24 +470,17 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
 	}
 	if (current_font)
 	{
-#ifdef HAVE_FREETYPE2
 		if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
 					    current_font->scaler.face_id,
 					    &current_face) < 0) ||
 		    (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
 					    &current_font->scaler,
 					    &current_font->size) < 0))
-#else
-		if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
-#endif
 		{
 			eDebug("FTC_Manager_Lookup_Size failed!");
 			return;
 		}
 	}
-#ifndef HAVE_FREETYPE2
-	cache_current_font=&current_font->font.font;
-#endif
 	previous=0;
 	use_kerning=FT_HAS_KERNING(current_face);
 }
@@ -525,7 +495,6 @@ int eTextPara::renderString(const char *string, int rflags)
 	if (!current_font)
 		return -1;
 
-#ifdef HAVE_FREETYPE2
 	if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
  				    current_font->scaler.face_id,
  				    &current_face) < 0) ||
@@ -536,17 +505,6 @@ int eTextPara::renderString(const char *string, int rflags)
 		eDebug("FTC_Manager_Lookup_Size failed!");
 		return -1;
 	}
-#else
-	if (&current_font->font.font != cache_current_font)
-	{
-		if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
-		{
-			eDebug("FTC_Manager_Lookup_Size failed!");
-			return -1;
-		}
-		cache_current_font=&current_font->font.font;
-	}
-#endif
 
 	if (!current_face)
 		eFatal("eTextPara::renderString: no current_face");
@@ -739,7 +697,6 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
 	if (!current_font)
 		return;
 
-#ifdef HAVE_FREETYPE2
 	if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
  				    current_font->scaler.face_id,
  				    &current_face) < 0) ||
@@ -750,17 +707,6 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
 		eDebug("FTC_Manager_Lookup_Size failed!");
 		return;
 	}
-#else
-	if (&current_font->font.font != cache_current_font)
-	{
-		if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
-		{
-			eDebug("FTC_Manager_Lookup_Size failed!");
-			return;
-		}
-		cache_current_font=&current_font->font.font;
-	}
-#endif
 
 	ePtr<gPixmap> target;
 	dc.getPixmap(target);