| -rw-r--r-- | freetype/config.in | 2 | ||||
| -rw-r--r-- | freetype/fontfactoryttf_qws.cpp | 18 | ||||
| -rw-r--r-- | freetype/freetype.pro | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/freetype/config.in b/freetype/config.in index 71c5df7..68b659a 100644 --- a/freetype/config.in +++ b/freetype/config.in @@ -1,4 +1,4 @@ config FREETYPE boolean "opie-freetype (support for fonts used via the freetype library)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp index 1f082a9..1ed0d2c 100644 --- a/freetype/fontfactoryttf_qws.cpp +++ b/freetype/fontfactoryttf_qws.cpp @@ -15,15 +15,17 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ - #include "fontfactoryttf_qws.h" +#include <opie2/odebug.h> +using namespace Opie::Core; + #ifdef QT_NO_FREETYPE #include "qfontdata_p.h" #include <string.h> #include <stdio.h> @@ -104,19 +106,19 @@ public: QGlyph result; FT_Error err; err=FT_Load_Glyph(myface,index,FT_LOAD_DEFAULT); if(err) - qFatal("Load glyph error %x",err); + ofatal << "Load glyph error " << err << "" << oendl; int width=0,height=0,pitch=0,size=0; FT_Glyph glyph; err=FT_Get_Glyph( myface->glyph, &glyph ); if(err) - qFatal("Get glyph error %x",err); + ofatal << "Get glyph error " << err << "" << oendl; FT_BBox bbox; FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_gridfit, &bbox); FT_Vector origin; origin.x = -bbox.xMin; @@ -124,13 +126,13 @@ public: if ( FT_IS_SCALABLE(myface) ) { err=FT_Glyph_To_Bitmap(&glyph, smooth ? ft_render_mode_normal : ft_render_mode_mono, &origin, 1); // destroy original glyph if(err) - qWarning("Get bitmap error %d",err); + owarn << "Get bitmap error " << err << "" << oendl; } if ( !err ) { FT_Bitmap bm = ((FT_BitmapGlyph)glyph)->bitmap; pitch = bm.pitch; size=pitch*bm.rows; @@ -177,13 +179,13 @@ private: // Assume 72 dpi for now const int dpi=72; FT_Error err; err=FT_Set_Char_Size(myface, psize,psize,dpi,dpi); if (err) { if (FT_IS_SCALABLE(myface) ) { - qWarning("Set char size error %x for size %d",err,ptsize); + owarn << "Set char size error " << err << " for size " << ptsize << "" << oendl; } else { int best=-1; int bdh=99; for (int i=0; i<myface->num_fixed_sizes; i++) { FT_Bitmap_Size& sz=myface->available_sizes[i]; int dh = sz.height - ptsize*dpi/72/10; @@ -195,24 +197,24 @@ private: } if ( best >= 0 ) err=FT_Set_Pixel_Sizes(myface, myface->available_sizes[best].width, myface->available_sizes[best].height); if ( err ) - qWarning("Set char size error %x for size %d",err,ptsize); + owarn << "Set char size error " << err << " for size " << ptsize << "" << oendl; } } } }; QFontFactoryFT::QFontFactoryFT() { FT_Error err; err=FT_Init_FreeType(&library); if(err) { - qFatal("Couldn't initialise Freetype library"); + ofatal << "Couldn't initialise Freetype library" << oendl; } } QFontFactoryFT::~QFontFactoryFT() { } @@ -233,13 +235,13 @@ void QFontFactoryFT::load(QDiskFont * qdf) const return; QDiskFontFT *f = new QDiskFontFT; qdf->p=f; FT_Error err; err=FT_New_Face(library,qdf->file.ascii(),0,&(f->face)); if(err) { - qFatal("Error %d opening face",err); + ofatal << "Error " << err << " opening face" << oendl; } qdf->loaded=true; } #endif // QT_NO_FREETYPE diff --git a/freetype/freetype.pro b/freetype/freetype.pro index bdc37f6..ca2841c 100644 --- a/freetype/freetype.pro +++ b/freetype/freetype.pro @@ -1,15 +1,13 @@ TEMPLATE = lib -CONFIG += qt warn_on release +CONFIG += qt warn_on HEADERS = fontfactoryttf_qws.h freetypefactoryimpl.h SOURCES = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp qt2:HEADERS += qfontdata_p.h TARGET = freetypefactory DESTDIR = $(OPIEDIR)/plugins/fontfactories INCLUDEPATH += $(QTDIR)/src/3rdparty/freetype/include $(QTDIR)/src/3rdparty/freetype/include/freetype/config $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lfreetype -VERSION = 1.0.0 - - +LIBS += -lqpe -lfreetype -lopiecore2 +VERSION = 1.0.1 include ( $(OPIEDIR)/include.pro ) |