2000-09-26
2000-09-26 23:14:03 by Per Hedbor <ph@opera.com>
-
de215286f1f74a7ef096aa5397daa079d15a3d55
(9 lines)
(+5/-4)
[
Show
| Annotate
]
Branch: 5.2
Be more paranoid
Rev: server/font_handlers/builtin.pike:1.5
1:
#include <config.h>
inherit "ttf";
- constant cvs_version = "$Id: builtin.pike,v 1.4 2000/09/21 03:57:44 per Exp $";
+ constant cvs_version = "$Id: builtin.pike,v 1.5 2000/09/26 23:14:03 per Exp $";
constant name = "Builtin fonts";
constant doc = "Fonts included in pike (and roxen)";
17:
switch( replace(lower_case(fnt)," ","_")-"_" )
{
case "roxenbuiltin":
- #if constant(__rbf)
+ #if constant(__rbf) && constant(grbf)
return ({
([
"name":"roxen builtin",
64: Inside #if defined(THREADS)
#ifdef THREADS
object lock = lock->lock();
#endif
- #if constant(__rbf)
+ #if constant(__rbf) && constant(grbf)
if( !roxenbuiltin )
- roxenbuiltin = grbf();
+ catch(roxenbuiltin = grbf());
if( roxenbuiltin )
return TTFWrapper( roxenbuiltin(), size, "-" );
#endif