Mercurial > octave-nkf

comparison src/txt-eng-ft.cc @ 13999:1221086f1ba5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid segfault related to fontconfig memory management * txt-eng-ft.cc (ft_manager::instance_ok): Comment out code to add cleanup_instance to singleton_cleanup_list.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Dec 2011 16:08:13 -0500
parents e1f76bfe0452
children 1555c5a177c9
comparison
equal deleted inserted replaced
13998:6e9bf84dec3c 13999:1221086f1ba5
75 75
76 if (! instance) 76 if (! instance)
77 { 77 {
78 instance = new ft_manager (); 78 instance = new ft_manager ();
79 79
80 // FIXME -- there seem to be some memory management errors
81 // related to fontconfig that cause segfaults when Octave
82 // exits if ft_manager::instance is explicitly deleted. So
83 // skip doing that for now.
84 #if 0
80 if (instance) 85 if (instance)
81 singleton_cleanup_list::add (cleanup_instance); 86 singleton_cleanup_list::add (cleanup_instance);
87 #endif
82 } 88 }
83 89
84 if (! instance) 90 if (! instance)
85 { 91 {
86 ::error ("unable to create ft_manager!"); 92 ::error ("unable to create ft_manager!");