emacs-diffs
[Top][All Lists]
Advanced

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

master db7b4db: Fix GNUstep build


From: Alan Third
Subject: master db7b4db: Fix GNUstep build
Date: Sun, 11 Oct 2020 15:48:13 -0400 (EDT)

branch: master
commit db7b4dbe946e09d0bcb211aff446ba72feab3b47
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>

    Fix GNUstep build
    
    Fix mistakes made when removing Cocoa code from nsfont.m.
    
    * src/nsfont.m (nsfont_draw): Remove spurious #ifdef.
    (ns_uni_to_glyphs): The #if/#endif was removed from this code, but the
    code itself not removed.  Remove it now.
---
 src/nsfont.m | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/nsfont.m b/src/nsfont.m
index d1543ec..378a640 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1089,7 +1089,6 @@ nsfont_draw (struct glyph_string *s, int from, int to, 
int x, int y,
               : FRAME_BACKGROUND_COLOR (s->f)));
 
   /* render under GNUstep using DPS */
-#ifdef NS_IMPL_GNUSTEP
   {
     NSGraphicsContext *context = GSCurrentContext ();
 
@@ -1162,10 +1161,6 @@ ns_uni_to_glyphs (struct nsfont_info *font_info, 
unsigned char block)
     for (i = 0; i < 0x100; i++, glyphs++)
       {
         g = unichars[i];
-        g = glyphStorage->cglyphs[i];
-        /* TODO: is this a good check?  Maybe need to use coveredChars.  */
-        if (g > numGlyphs || g == NSNullGlyph)
-          g = INVALID_GLYPH; /* Hopefully unused...  */
         *glyphs = g;
       }
   }



reply via email to

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