summaryrefslogtreecommitdiff
path: root/freetype/fontfactoryttf_qws.cpp
Side-by-side diff
Diffstat (limited to 'freetype/fontfactoryttf_qws.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--freetype/fontfactoryttf_qws.cpp18
1 files changed, 10 insertions, 8 deletions
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
@@ -18,9 +18,11 @@
**
**********************************************************************/
-
#include "fontfactoryttf_qws.h"
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
#ifdef QT_NO_FREETYPE
#include "qfontdata_p.h"
@@ -107,13 +109,13 @@ public:
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);
@@ -127,7 +129,7 @@ public:
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 ) {
@@ -180,7 +182,7 @@ private:
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;
@@ -198,7 +200,7 @@ private:
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;
}
}
}
@@ -209,7 +211,7 @@ 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;
}
}
@@ -236,7 +238,7 @@ void QFontFactoryFT::load(QDiskFont * qdf) const
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;
}