* Source/xlib/GSXftFontInfo.m

* Source/xlib/XGFontManager.m
* Source/xlib/XGBitmap.m: Remove some compiler warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@37519 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,7 +1,13 @@
+2013-12-26  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/xlib/GSXftFontInfo.m
+	* Source/xlib/XGFontManager.m
+	* Source/xlib/XGBitmap.m: Remove some compiler warnings.
+
 2013-12-24  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Version: bump to 0.24.0
-	
+
 2013-12-23  Fred Kiefer <FredKiefer@gmx.de>
 
         * Update release notes to prepare for upcoming release.

Source/xlib/GSXftFontInfo.m

@@ -730,7 +730,6 @@ static FT_Outline_Funcs bezierpath_funcs = {
 {
   Display *xdpy = [XGServer currentXDisplay];
   int defaultScreen = DefaultScreen(xdpy);
-  NSString *weightString = nil;
 
 #ifdef HAVE_FC
   FcFont *realFont = [allFonts objectForKey: fontName];
@@ -775,28 +774,22 @@ static FT_Outline_Funcs bezierpath_funcs = {
         {
         case FC_WEIGHT_LIGHT:
             weight = 3;
-            weightString = @"light";
             break;
         case FC_WEIGHT_MEDIUM:
             weight = 6;
-            weightString = @"medium";
             break;
         case FC_WEIGHT_DEMIBOLD:
             weight = 7;
-            weightString = @"demibold";
             break;
         case FC_WEIGHT_BOLD:
             weight = 9;
-            weightString = @"bold";
             break;
         case FC_WEIGHT_BLACK:
             weight = 12;
-            weightString = @"black";
             break;
 	default:
           // Don't know
           weight = 6;
-          weightString = @"medium";
 	}
     }
 
@@ -875,23 +868,18 @@ static FT_Outline_Funcs bezierpath_funcs = {
         {
         case 0:
           weight = 3;
-          weightString = @"light";
           break;
         case 100:
           weight = 6;
-          weightString = @"medium";
           break;
         case 180:
           weight = 7;
-          weightString = @"demibold";
           break;
         case 200:
           weight = 9;
-          weightString = @"bold";
           break;
         case 210:
           weight = 12;
-          weightString = @"black";
           break;
         default:
           // Don't know

Source/xlib/XGBitmap.m

@@ -1261,8 +1261,7 @@ _pixmap_read_alpha(RContext *context,
     }
   else
     {
-      XColor		c2;
-      unsigned		row;
+      unsigned row;
       unsigned long pixels[CSIZE];
       XColor colors[CSIZE];
       BOOL empty[CSIZE];
@@ -1279,9 +1278,8 @@ _pixmap_read_alpha(RContext *context,
        * RGB color values - on the downside, it's very slow.
        */
       pixel = (unsigned long)-1;	// Never valid?
-      c2.pixel = pixel;
 
-       for (row = 0; row < srect.height; row++)
+      for (row = 0; row < srect.height; row++)
 	{
 	  unsigned	col;
 

Source/xlib/XGFontManager.m

@@ -49,6 +49,11 @@
 
 #define stringify_it(X) #X
 
+@interface NSBundle (Private)
+// Maybe we should rather use -pathForAuxiliaryExecutable:?
++ (NSString *) _absolutePathOfExecutable: (NSString *)path;
+@end
+
 static NSMutableDictionary* creationDictionary;
 
 // Fills in the size into an creation string to make it an X font name