Mercurial > octave

comparison libinterp/corefcn/txt-eng-ft.cc @ 21102:dfcb9d74b253

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename local gripe_XXX functions to err_XXX or warn_XXX. * graphics.cc (err_set_invalid): Add OCTAVE_NORETURN attribute. * graphisc.cc: Rename gripe_set_invalid to err_set_invalid. * jit-typeinfo.cc (err_bad_result): Rename from gripe_bad_result. * load-save.cc (err_file_open): Rename from gripe_file_open. * ls-mat5.cc (warn_dim_too_large): Rename from gripe_dim_too_large. * oct-stream.cc (err_invalid_file_id): Rename from gripe_invalid_file_id. * txt-eng-ft.cc (warn_missing_glyph, warn_glyph_render): Rename from gripe_missing_glyph, gripe_glyph_render. * xpow.cc: Add FIXME about strange gripe_failed_diagonalization function. * ov-base-int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc (warn_load, warn_save): ov-base.cc (warn_load, warn_save, err_indexed_assignment, err_assign_conversion_failed, err_no_conversion): Rename from gripe_XXX version. * ov-base.h (warn_load, warn_save): Rename from gripe_load, gripe_save. * ov-classdef.cc (err_method_access, err_property_access): Rename from gripe_method_access, gripe_property_access. * ov-classdef.h (err_invalid_object): Rename from gripe_invalid_object. * ov-oncleanup.h (gripe_internal): Delete function. Place single calling instance directly in code. * ov.cc (err_binary_op, err_binary_op_conv, err_unary_op, err_unary_op_conv, err_unary_op_conversion_failed): Add OCTAVE_NORETURN attribute. Rename from gripe_XXX. * ov.cc (err_cat_op, err_cat_op_conv, ): Rename from gripe_XXX. * lex.h (warn_single_quote_string, warn_language_extension, maybe_warn_language_extension_comment, warn_language_extension_continuation, warn_language_extension_operator): Rename from gripe_XXX. * lex.ll (warn_single_quote_string, warn_language_extension, maybe_warn_language_extension_comment, warn_language_extension_continuation, warn_language_extension_operator): Rename from gripe_XXX. * pt-check.cc (errmsg): Rename from gripe. * pt-check.h (errmsg): Add OCTAVE_NORETURN attribute. Rename from gripe. * PermMatrix.cc (err_invalid_permutation): Add OCTAVE_NORETURN attribute. Rename from gripe_invalid_permutation. * idx-vector.cc (err_invalid_range): Add OCTAVE_NORETURN attribute. Rename from gripe_invalid_range. liboctave/numeric/lo-specfun.cc (err_betainc_nonconformant): Add OCTAVE_NORETURN attribute. Rename from gripe_betainc_nonconformant. * oct-group.cc (err_invalid): New static function. * oct-group.h (gripe_invalid): Delete private function. * oct-passwd.cc (err_invalid): New static function. * oct-passwd.h (gripe_invalid): Delete private function. * data-conv.cc (err_unrecognized_float_fmt): Add OCTAVE_NORETURN attribute. Rename from gripe_unrecognized_float_fmt. * lo-cutils.c (warn_missing_wait_macro): Rename from gripe_missing_wait_macro. * unwind-prot.cc (err_unhandled_exception): Rename from gripe_exception. * unwind-prot.h (err_unhandled_exception): Rename from gripe_exception.
author Rik <rik@octave.org>
date Mon, 18 Jan 2016 21:06:26 -0800
parents 1edf15793cac
children fcac5dbbf9ed
comparison
equal deleted inserted replaced
21101:2e8aea678f2a 21102:dfcb9d74b253
44 44
45 // FIXME: maybe issue at most one warning per glyph/font/size/weight 45 // FIXME: maybe issue at most one warning per glyph/font/size/weight
46 // combination. 46 // combination.
47 47
48 static void 48 static void
49 gripe_missing_glyph (FT_ULong c) 49 warn_missing_glyph (FT_ULong c)
50 { 50 {
51 warning_with_id ("Octave:missing-glyph", 51 warning_with_id ("Octave:missing-glyph",
52 "ft_render: skipping missing glyph for character '%x'", 52 "ft_render: skipping missing glyph for character '%x'", c);
53 c);
54 } 53 }
55 54
56 static void 55 static void
57 gripe_glyph_render (FT_ULong c) 56 warn_glyph_render (FT_ULong c)
58 { 57 {
59 warning_with_id ("Octave:glyph-render", 58 warning_with_id ("Octave:glyph-render",
60 "ft_render: unable to render glyph for character '%x'", 59 "ft_render: unable to render glyph for character '%x'", c);
61 c);
62 } 60 }
63 61
64 #ifdef _MSC_VER 62 #ifdef _MSC_VER
65 // This is just a trick to avoid multiple symbol definitions. 63 // This is just a trick to avoid multiple symbol definitions.
66 // PermMatrix.h contains a dllexport'ed Array<octave_idx_type> 64 // PermMatrix.h contains a dllexport'ed Array<octave_idx_type>
506 if (code != '\n' 504 if (code != '\n'
507 && (! glyph_index 505 && (! glyph_index
508 || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT))) 506 || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT)))
509 { 507 {
510 glyph_index = 0; 508 glyph_index = 0;
511 gripe_missing_glyph (code); 509 warn_missing_glyph (code);
512 } 510 }
513 else 511 else
514 { 512 {
515 switch (mode) 513 switch (mode)
516 { 514 {
520 glyph_index = FT_Get_Char_Index (face, ' '); 518 glyph_index = FT_Get_Char_Index (face, ' ');
521 if (! glyph_index 519 if (! glyph_index
522 || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT)) 520 || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT))
523 { 521 {
524 glyph_index = 0; 522 glyph_index = 0;
525 gripe_missing_glyph (' '); 523 warn_missing_glyph (' ');
526 } 524 }
527 else 525 else
528 push_new_line (); 526 push_new_line ();
529 } 527 }
530 else if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL)) 528 else if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL))
531 { 529 {
532 glyph_index = 0; 530 glyph_index = 0;
533 gripe_glyph_render (code); 531 warn_glyph_render (code);
534 } 532 }
535 else 533 else
536 { 534 {
537 FT_Bitmap& bitmap = face->glyph->bitmap; 535 FT_Bitmap& bitmap = face->glyph->bitmap;
538 int x0, y0; 536 int x0, y0;
585 glyph_index = FT_Get_Char_Index (face, ' '); 583 glyph_index = FT_Get_Char_Index (face, ' ');
586 if (! glyph_index 584 if (! glyph_index
587 || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT)) 585 || FT_Load_Glyph (face, glyph_index, FT_LOAD_DEFAULT))
588 { 586 {
589 glyph_index = 0; 587 glyph_index = 0;
590 gripe_missing_glyph (' '); 588 warn_missing_glyph (' ');
591 } 589 }
592 else 590 else
593 push_new_line (); 591 push_new_line ();
594 } 592 }
595 else 593 else