mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

(mac_query_char_extents): Don't return glyph ID if layout

Browse Source 
adjustment is needed.
(mac_load_query_font): Check if width and height are positive.
This commit is contained in:
YAMAMOTO Mitsuharu 2006-10-16 08:59:31 +00:00
parent 2e6266ac57
commit 7c682cf194
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ChangeLog
View File

@ -1,3 +1,16 @@
2006-10-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* dispnew.c (adjust_frame_glyphs_for_frame_redisplay): Remove unused
variable ch_dim.
(adjust_frame_glyphs_for_window_redisplay): Likewise. Don't allocate
menu bar window matrices on non-X systems.
* mac.c (Fmac_get_preference, Fmac_code_convert_string): Add GCPROs.
* macterm.c (mac_query_char_extents): Don't return glyph ID if layout
adjustment is needed.
(mac_load_query_font): Check if width and height are positive.
2006-10-14 Richard Stallman <rms@gnu.org>
* sysdep.c (init_sys_modes): Delete DEFVAR_LISP in the wrong place.

10
src/macterm.c
View File

@ -1198,7 +1198,12 @@ mac_query_char_extents (style, c,
err1 = ATSUGetGlyphInfo (text_layout, kATSUFromTextBeginning,
kATSUToTextEnd, &count,
&glyph_info_array);
if (err1 == noErr)
if (err1 == noErr
/* Make sure that we don't have to make layout
adjustments. */
&& glyph_info_array.glyphs[0].deltaY == 0.0f
&& glyph_info_array.glyphs[0].idealX == 0.0f
&& glyph_info_array.glyphs[0].screenX == 0)
{
xassert (glyph_info_array.glyphs[0].glyphID);
*cg_glyph = glyph_info_array.glyphs[0].glyphID;
@ -7963,7 +7968,8 @@ mac_load_query_font (f, fontname)
NULL
#endif
);
if (err != noErr)
if (err != noErr
|| space_bounds->width <= 0 || FONT_HEIGHT (font) <= 0)
{
mac_unload_font (&one_mac_display_info, font);
return NULL;