Mercurial > emacs

comparison src/ftfont.c @ 111997:a5a188ddc758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor clean up to silence some gcc warnings. * src/window.c (Fset_window_buffer): * src/xterm.c (x_set_frame_alpha): Restructure code to silence compiler warning. (handle_one_xevent): Remove unused var `p'. (do_ewmh_fullscreen): Remove unused var `lval'. (xembed_set_info): Remove unused var `atom'. * src/textprop.c (Fremove_list_of_text_properties): Add braces to silence compiler warning. * src/fontset.c (fontset_id_valid_p, dump_fontset): * src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration. * src/eval.c (Feval, Ffuncall): Avoid unneeded gotos. * src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause' label only when it's used. * src/image.c (x_create_bitmap_from_xpm_data): * src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like its callers. * src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and `consumed_chars'. (DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'. (decode_coding_emacs_mule): Remove unused label `retry'. (detect_eol): Add parens to silence compiler warning. * src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where it's used to silence the compiler. (make_number): Modernize k&r declaration. (mark_char_table): Add parens to silence compiler warning.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 19 Dec 2010 00:43:42 -0500
parents 1e95f3ea022d
children 417b1e4d63cd
comparison
equal deleted inserted replaced
111996:90a2d870e83e 111997:a5a188ddc758
1765 the lastly applied feature in each glyph of IN. If OUT is not 1765 the lastly applied feature in each glyph of IN. If OUT is not
1766 NULL, append the resulting glyphs to OUT while storing glyph 1766 NULL, append the resulting glyphs to OUT while storing glyph
1767 position adjustment information in ADJUSTMENT. */ 1767 position adjustment information in ADJUSTMENT. */
1768 1768
1769 static int 1769 static int
1770 ftfont_drive_otf (font, spec, in, from, to, out, adjustment) 1770 ftfont_drive_otf (MFLTFont *font,
1771 MFLTFont *font; 1771 MFLTOtfSpec *spec,
1772 MFLTOtfSpec *spec; 1772 MFLTGlyphString *in,
1773 MFLTGlyphString *in; 1773 int from,
1774 int from, to; 1774 int to,
1775 MFLTGlyphString *out; 1775 MFLTGlyphString *out,
1776 MFLTGlyphAdjustment *adjustment; 1776 MFLTGlyphAdjustment *adjustment)
1777 { 1777 {
1778 struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font; 1778 struct MFLTFontFT *flt_font_ft = (struct MFLTFontFT *) font;
1779 FT_Face ft_face = flt_font_ft->ft_face; 1779 FT_Face ft_face = flt_font_ft->ft_face;
1780 OTF *otf = flt_font_ft->otf; 1780 OTF *otf = flt_font_ft->otf;
1781 int len = to - from; 1781 int len = to - from;