bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#831: marked as done (23.0.60; error in nsfonts.m)


From: Emacs bug Tracking System
Subject: bug#831: marked as done (23.0.60; error in nsfonts.m)
Date: Fri, 3 Oct 2008 11:10:06 -0700

Your message dated Fri, 3 Oct 2008 14:03:20 -0400
with message-id <66A91CA5-0AFE-42F4-B27F-3F24BE8626A6@gmail.com>
and subject line #823 - 23.0.60; uninitialised variable gidx in nsfont.m - 
Emacs bug report logs
has caused the Emacs bug report #823,
regarding 23.0.60; error in nsfonts.m
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact don@donarmstrong.com
immediately.)


-- 
823: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=823
Emacs Bug Tracking System
Contact don@donarmstrong.com with problems
--- Begin Message --- Subject: 23.0.60; error in nsfonts.m Date: Sat, 30 Aug 2008 13:32:39 -0400 User-agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.60 (darwin)
I'm trying to build emacs from a current CVS checkout on OSX 10.4.11
with the configure option --with-ns.

Build fails because of error in nsfonts.m.  That file references a
variable called gidx, which is not defined in the relevant structure.
The attached patch changes all instances of gidx to x, and allows emacs
to build on my system.

diff --git a/src/nsfont.m b/src/nsfont.m
index f49cd0f..10b1c90 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -904,14 +904,14 @@ nsfont_draw (struct glyph_string *s, int from, int to, 
int x, int y,
     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->x; /* advance into composition */
+    for (i =0; i<s->nchars - s->x; i++, t++)
       {
         hi = (*t & 0xFF00) >> 8;
         lo = *t & 0x00FF;
         if (isComposite)
           {
-            cwidth = s->cmp->offsets[s->gidx++ * 2] - twidth;
+            cwidth = s->cmp->offsets[s->x++ * 2] - twidth;
           }
         else
           {
@@ -1094,13 +1094,13 @@ nsfont_draw (struct glyph_string *s, int from, int to, 
int x, int y,
       [col set];
 
     CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y);
-    CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx,
+    CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->x,
                                     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->x,
                                         advances, len);
       }
 

In GNU Emacs 23.0.60.1 (powerpc-apple-darwin8.11.0, X toolkit)
 of 2008-08-29 on malibu.local
Important settings:
  value of $LC_ALL: en_US.UTF-8
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: en_US.UTF-8
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: nil
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default-enable-multibyte-characters: t



-- 
Austin Frank
http://aufrank.net
GPG Public Key (D7398C2F): http://aufrank.net/personal.asc

Attachment: pgpMwFV4yZgT8.pgp
Description: PGP signature


--- End Message ---
--- Begin Message --- Subject: #823 - 23.0.60; uninitialised variable gidx in nsfont.m - Emacs bug report logs Date: Fri, 3 Oct 2008 14:03:20 -0400 Summary: the variable gidx was removed during Kenichi Handa's update of composition handling and it took some time to update all of the code using it:


On 2008-08-29 Kenichi Handa changed the glyph_string data structure, composition-related portion

On 2008-09-07 Teodor Zlatanov fixed the compiler error by changing glyph_string.gidx to glyph_string.cmp_from

On 2008-09-27 Adrian Robert updated this patch to approximate the behavior before Handa's changes



--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]