comparison libinterp/corefcn/txt-eng-ft.cc @ 20638:7ac907da9fba

Use error() rather than ::error() unless explicitly required. * resource-manager.cc (instance_ok), shortcut-manager.cc (instance_ok), daspk.cc (DASPK_ABORT, DASPK_ABORT2), dasrt.cc (DASRT_ABORT, DASRT_ABORT2), dassl.cc (DASSL_ABORT, DASSL_ABORT2), debug.cc (instance_ok), display.cc (instance_ok), dynamic-ld.cc (octave_shlib_list::instance_ok, octave_dynamic_loader::instance_ok, do_load_oct, do_load_mex), file-io.cc (fopen_mode_to_ios_mode, do_stream_open, Ffprintf, Fsprintf, Fscanf, Ffscanf, get_sscanf_data, Fsscanf, do_fread, do_fwrite, Fpopen, Ftempname, convert, Fumask), graphics.in.h (graphics_toolkit::instance_ok, gh_manager::instance_ok), load-path.cc (instance_ok), ls-oct-ascii.cc (save_three_d), lsode.cc (LSODE_ABORT, LSODE_ABORT2), oct-errno.in.cc (instance_ok), octave-link.cc (connect_link), pager.cc (octave_pager_stream::instance_ok, octave_diary_stream::instance_ok), quad.cc (QUAD_ABORT, QUAD_ABORT2), sighandlers.cc (w32_interrupt_manager::instance_ok, octave_child_list::instance_ok), symtab.cc (do_update_nest), symtab.h (instance_ok), syscalls.cc (convert), toplev.h (instance_ok), txt-eng-ft.cc (instance_ok, set_mode), urlwrite.cc (instance_ok), __init_fltk__.cc (instance_ok), ov-builtin.cc (do_multi_index_op), ov-classdef.cc (class_fevalStatic, make_class, octave_classdef::subsasgn, do_multi_index_op, cdef_object_array::subsref, cdef_object_array::subsasgn, install_meth, meta_subsref, run_constructor, make_meta_class, get_value, set_value, check_method), ov-classdef.h (meta_subsref, instance_ok), ov-fcn-handle.cc (octave_fcn_handle), ov-mex-fcn.cc (do_multi_index_op), ov-range.h (octave_range), ov-typeinfo.cc (instance_ok), ov-usr-fcn.cc (subsref, do_multi_index_op), pt-arg-list.cc (Fend, convert_to_const_vector), pt-cell.cc (rvalue1), pt-colon.cc (append, rvalue1), pt-eval.cc (visit_simple_for_command, visit_switch_command), pt-exp.cc (is_logically_true, rvalue), pt-id.cc (eval_undefined_error), pt-id.h (workspace_error), pt-mat.cc (get_concat_class): Use error() rather than ::error().
author Rik <rik@octave.org>
date Thu, 06 Aug 2015 08:09:01 -0700
parents 4197fc428c7d
children 9267c95dbd71
comparison
equal deleted inserted replaced
20637:d5b877b86ed4 20638:7ac907da9fba
88 singleton_cleanup_list::add (cleanup_instance); 88 singleton_cleanup_list::add (cleanup_instance);
89 } 89 }
90 90
91 if (! instance) 91 if (! instance)
92 { 92 {
93 ::error ("unable to create ft_manager!"); 93 error ("unable to create ft_manager!");
94 94
95 retval = false; 95 retval = false;
96 } 96 }
97 97
98 return retval; 98 return retval;
136 136
137 ft_manager (void) 137 ft_manager (void)
138 : library (), freetype_initialized (false), fontconfig_initialized (false) 138 : library (), freetype_initialized (false), fontconfig_initialized (false)
139 { 139 {
140 if (FT_Init_FreeType (&library)) 140 if (FT_Init_FreeType (&library))
141 ::error ("unable to initialize FreeType library"); 141 error ("unable to initialize FreeType library");
142 else 142 else
143 freetype_initialized = true; 143 freetype_initialized = true;
144 144
145 #if defined (HAVE_FONTCONFIG) 145 #if defined (HAVE_FONTCONFIG)
146 if (! FcInit ()) 146 if (! FcInit ())
147 ::error ("unable to initialize fontconfig library"); 147 error ("unable to initialize fontconfig library");
148 else 148 else
149 fontconfig_initialized = true; 149 fontconfig_initialized = true;
150 #endif 150 #endif
151 } 151 }
152 152
490 line_yoffset = -bbox(1)-1; 490 line_yoffset = -bbox(1)-1;
491 yoffset = 0; 491 yoffset = 0;
492 } 492 }
493 break; 493 break;
494 default: 494 default:
495 ::error ("ft_render: invalid mode '%d'", mode); 495 error ("ft_render: invalid mode '%d'", mode);
496 break; 496 break;
497 } 497 }
498 } 498 }
499 499
500 FT_UInt 500 FT_UInt