# HG changeset patch # User John W. Eaton # Date 1296406895 18000 # Node ID cb4ac5e4d987efb127b5873dffb7612e26892cb3 # Parent abcd61f965e59acbd328ec59b68870b1e6722b63 txt-eng-ft.cc (ft_manager::ft_manager): omit fc_init_done from init list if fontconfig is missing diff -r abcd61f965e5 -r cb4ac5e4d987 src/ChangeLog --- a/src/ChangeLog Sun Jan 30 07:52:36 2011 -0800 +++ b/src/ChangeLog Sun Jan 30 12:01:35 2011 -0500 @@ -1,3 +1,8 @@ +2011-01-30 John W. Eaton + + * txt-eng-ft.cc (ft_manager::ft_manager): Omit fc_init_done from + initialization list if fontconfig is missing. + 2011-01-30 Pascal Dupuis * oct-parse.yy (class stdio_stream_reader): Disallow copying. diff -r abcd61f965e5 -r cb4ac5e4d987 src/txt-eng-ft.cc --- a/src/txt-eng-ft.cc Sun Jan 30 07:52:36 2011 -0800 +++ b/src/txt-eng-ft.cc Sun Jan 30 12:01:35 2011 -0500 @@ -75,7 +75,10 @@ ft_manager& operator = (const ft_manager&); - ft_manager (void) : library (), fc_init_done (false) + ft_manager (void) : library () +#if HAVE_FONTCONFIG + , fc_init_done (false) +#endif { if (FT_Init_FreeType (&library)) {