[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/nsfont.m,v
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] Changes to emacs/src/nsfont.m,v |
Date: |
Sun, 07 Sep 2008 11:16:35 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Teodor Zlatanov <tzz> 08/09/07 11:16:29
Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- nsfont.m 21 Aug 2008 02:49:00 -0000 1.11
+++ nsfont.m 7 Sep 2008 11:16:23 -0000 1.12
@@ -904,14 +904,14 @@
int hi, lo;
char isComposite = 0; /* s->first_glyph->type == COMPOSITE_GLYPH; */
/* FIXME: composition: no vertical displacement is considered. */
- t+= s->gidx; /* advance into composition */
- for (i =0; i<s->nchars - s->gidx; i++, t++)
+ t+= s->cmp_from; /* advance into composition */
+ for (i =0; i<s->nchars - s->cmp_from; i++, t++)
{
hi = (*t & 0xFF00) >> 8;
lo = *t & 0x00FF;
if (isComposite)
{
- cwidth = s->cmp->offsets[s->gidx++ * 2] - twidth;
+ cwidth = s->cmp->offsets[s->cmp_from++ * 2] - twidth;
}
else
{
@@ -1094,13 +1094,13 @@
[col set];
CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y);
- CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx,
+ CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from,
advances, len);
if (face->overstrike)
{
CGContextSetTextPosition (gcontext, r.origin.x+0.5, r.origin.y);
- CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx,
+ CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->cmp_from,
advances, len);
}
- [Emacs-diffs] Changes to emacs/src/nsfont.m,v,
Teodor Zlatanov <=