[Gnustep-cvs] r40246 - in /libs/back/branches/gnustep_testplant_branch: Headers/xlib/ Source/xlib/

[gna]

Author: mlytwyn
Date: Tue Nov 29 19:56:27 2016
New Revision: 40246

URL: http://svn.gna.org/viewcvs/gnustep?rev=40246&view=rev
Log:
Misc fixes and float->CGFloat updates

Modified:
    libs/back/branches/gnustep_testplant_branch/Headers/xlib/XGPrivate.h
    libs/back/branches/gnustep_testplant_branch/Source/xlib/GSXftFontInfo.m
    libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFont.m
    libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFontManager.m

Modified: libs/back/branches/gnustep_testplant_branch/Headers/xlib/XGPrivate.h
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Headers/xlib/XGPrivate.h?rev=40246&r1=40245&r2=40246&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Headers/xlib/XGPrivate.h        
(original)
+++ libs/back/branches/gnustep_testplant_branch/Headers/xlib/XGPrivate.h        
Tue Nov 29 19:56:27 2016
@@ -79,7 +79,7 @@
 - (void) drawGlyphs: (const NSGlyph *) glyphs length: (int) len
          onDisplay: (Display*) xdpy drawable: (Drawable) draw
               with: (GC) xgcntxt at: (XPoint) xp;
-- (float) widthOfGlyphs: (const NSGlyph *) glyphs length: (int) len;
+- (CGFloat) widthOfGlyphs: (const NSGlyph *) glyphs length: (int) len;
 
 @end
 

Modified: 
libs/back/branches/gnustep_testplant_branch/Source/xlib/GSXftFontInfo.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/xlib/GSXftFontInfo.m?rev=40246&r1=40245&r2=40246&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/xlib/GSXftFontInfo.m     
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/xlib/GSXftFontInfo.m     
Tue Nov 29 19:56:27 2016
@@ -408,7 +408,7 @@
                    len,
                    &extents);
 
-  return extents.width;
+  return (CGFloat)extents.width;
 }
 
 - (NSMultibyteGlyphPacking)glyphPacking

Modified: libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFont.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFont.m?rev=40246&r1=40245&r2=40246&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFont.m    
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFont.m    Tue Nov 
29 19:56:27 2016
@@ -241,7 +241,7 @@
 
 - (CGFloat) widthOf: (const char*) s length: (int) len
 {
-  return XTextWidth(font_info, s, len);
+  return (CGFloat)XTextWidth(font_info, s, len);
 }
 
 - (CGFloat) widthOfGlyphs: (const NSGlyph *) glyphs length: (int) len
@@ -254,7 +254,7 @@
       buf[i] = glyphs[i];
     }
 
-  return XTextWidth(font_info, buf, len);
+  return (CGFloat)XTextWidth(font_info, buf, len);
 }
 
 - (void) setActiveFor: (Display*) xdpy gc: (GC) xgcntxt

Modified: 
libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFontManager.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFontManager.m?rev=40246&r1=40245&r2=40246&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFontManager.m     
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/xlib/XGFontManager.m     
Tue Nov 29 19:56:27 2016
@@ -106,7 +106,7 @@
       if ([mgr fileExistsAtPath: path isDirectory: &flag] == NO || flag == NO)
        {
          NSLog(@"Library directory '%@' not available!", path);
-         return NO;
+         return nil;
        }
       path = [path stringByAppendingPathComponent: @"Fonts"];
       if ([mgr fileExistsAtPath: path] == NO)
@@ -116,7 +116,7 @@
       if ([mgr fileExistsAtPath: path isDirectory: &flag] == NO || flag == NO)
        {
          NSLog(@"Fonts directory '%@' not available!", path);
-         return NO;
+         return nil;
        }
       path = [path stringByAppendingPathComponent: @"Cache"];
       if ([mgr fileExistsAtPath: path] == NO)
@@ -126,7 +126,7 @@
       if ([mgr fileExistsAtPath: path isDirectory: &flag] == NO || flag == NO)
        {
          NSLog(@"Fonts directory '%@' not available!", path);
-         return NO;
+         return nil;
        }
       cacheName = [path stringByAppendingPathComponent: file_name];
       RETAIN(cacheName);


_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs