author | mickeyl <mickeyl> | 2004-04-05 10:36:31 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-05 10:36:31 (UTC) |
commit | 900fb3d498891d9aca81c362b2ea3460d1dc3f59 (patch) (unidiff) | |
tree | 35675d48a982d60934778b04983743759f694e2f /freetype/fontfactoryttf_qws.cpp | |
parent | 5a07a653948bfbfa5091a182ad62939c01624e38 (diff) | |
download | opie-900fb3d498891d9aca81c362b2ea3460d1dc3f59.zip opie-900fb3d498891d9aca81c362b2ea3460d1dc3f59.tar.gz opie-900fb3d498891d9aca81c362b2ea3460d1dc3f59.tar.bz2 |
convert to odebug
Diffstat (limited to 'freetype/fontfactoryttf_qws.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | freetype/fontfactoryttf_qws.cpp | 18 |
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 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | |||
22 | #include "fontfactoryttf_qws.h" | 21 | #include "fontfactoryttf_qws.h" |
23 | 22 | ||
23 | #include <opie2/odebug.h> | ||
24 | using namespace Opie::Core; | ||
25 | |||
24 | #ifdef QT_NO_FREETYPE | 26 | #ifdef QT_NO_FREETYPE |
25 | 27 | ||
26 | #include "qfontdata_p.h" | 28 | #include "qfontdata_p.h" |
@@ -107,13 +109,13 @@ public: | |||
107 | 109 | ||
108 | err=FT_Load_Glyph(myface,index,FT_LOAD_DEFAULT); | 110 | err=FT_Load_Glyph(myface,index,FT_LOAD_DEFAULT); |
109 | if(err) | 111 | if(err) |
110 | qFatal("Load glyph error %x",err); | 112 | ofatal << "Load glyph error " << err << "" << oendl; |
111 | 113 | ||
112 | int width=0,height=0,pitch=0,size=0; | 114 | int width=0,height=0,pitch=0,size=0; |
113 | FT_Glyph glyph; | 115 | FT_Glyph glyph; |
114 | err=FT_Get_Glyph( myface->glyph, &glyph ); | 116 | err=FT_Get_Glyph( myface->glyph, &glyph ); |
115 | if(err) | 117 | if(err) |
116 | qFatal("Get glyph error %x",err); | 118 | ofatal << "Get glyph error " << err << "" << oendl; |
117 | 119 | ||
118 | FT_BBox bbox; | 120 | FT_BBox bbox; |
119 | FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_gridfit, &bbox); | 121 | FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_gridfit, &bbox); |
@@ -127,7 +129,7 @@ public: | |||
127 | smooth ? ft_render_mode_normal : ft_render_mode_mono, | 129 | smooth ? ft_render_mode_normal : ft_render_mode_mono, |
128 | &origin, 1); // destroy original glyph | 130 | &origin, 1); // destroy original glyph |
129 | if(err) | 131 | if(err) |
130 | qWarning("Get bitmap error %d",err); | 132 | owarn << "Get bitmap error " << err << "" << oendl; |
131 | } | 133 | } |
132 | 134 | ||
133 | if ( !err ) { | 135 | if ( !err ) { |
@@ -180,7 +182,7 @@ private: | |||
180 | err=FT_Set_Char_Size(myface, psize,psize,dpi,dpi); | 182 | err=FT_Set_Char_Size(myface, psize,psize,dpi,dpi); |
181 | if (err) { | 183 | if (err) { |
182 | if (FT_IS_SCALABLE(myface) ) { | 184 | if (FT_IS_SCALABLE(myface) ) { |
183 | qWarning("Set char size error %x for size %d",err,ptsize); | 185 | owarn << "Set char size error " << err << " for size " << ptsize << "" << oendl; |
184 | } else { | 186 | } else { |
185 | int best=-1; | 187 | int best=-1; |
186 | int bdh=99; | 188 | int bdh=99; |
@@ -198,7 +200,7 @@ private: | |||
198 | myface->available_sizes[best].width, | 200 | myface->available_sizes[best].width, |
199 | myface->available_sizes[best].height); | 201 | myface->available_sizes[best].height); |
200 | if ( err ) | 202 | if ( err ) |
201 | qWarning("Set char size error %x for size %d",err,ptsize); | 203 | owarn << "Set char size error " << err << " for size " << ptsize << "" << oendl; |
202 | } | 204 | } |
203 | } | 205 | } |
204 | } | 206 | } |
@@ -209,7 +211,7 @@ QFontFactoryFT::QFontFactoryFT() | |||
209 | FT_Error err; | 211 | FT_Error err; |
210 | err=FT_Init_FreeType(&library); | 212 | err=FT_Init_FreeType(&library); |
211 | if(err) { | 213 | if(err) { |
212 | qFatal("Couldn't initialise Freetype library"); | 214 | ofatal << "Couldn't initialise Freetype library" << oendl; |
213 | } | 215 | } |
214 | } | 216 | } |
215 | 217 | ||
@@ -236,7 +238,7 @@ void QFontFactoryFT::load(QDiskFont * qdf) const | |||
236 | FT_Error err; | 238 | FT_Error err; |
237 | err=FT_New_Face(library,qdf->file.ascii(),0,&(f->face)); | 239 | err=FT_New_Face(library,qdf->file.ascii(),0,&(f->face)); |
238 | if(err) { | 240 | if(err) { |
239 | qFatal("Error %d opening face",err); | 241 | ofatal << "Error " << err << " opening face" << oendl; |
240 | } | 242 | } |
241 | qdf->loaded=true; | 243 | qdf->loaded=true; |
242 | } | 244 | } |