summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--freetype/config.in2
-rw-r--r--freetype/fontfactoryttf_qws.cpp18
-rw-r--r--freetype/freetype.pro8
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
@@ -17,11 +17,13 @@
** 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>
@@ -106,15 +108,15 @@ public:
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);
@@ -126,9 +128,9 @@ public:
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;
@@ -179,9 +181,9 @@ private:
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++) {
@@ -197,9 +199,9 @@ private:
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;
}
}
}
};
@@ -208,9 +210,9 @@ 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()
@@ -235,9 +237,9 @@ void QFontFactoryFT::load(QDiskFont * qdf) const
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;
}
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 )