Index: Source/art/ftfont.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/Source/art/ftfont.m,v
retrieving revision 1.17
diff -u -r1.17 ftfont.m
--- Source/art/ftfont.m	27 Jan 2003 17:14:10 -0000	1.17
+++ Source/art/ftfont.m	28 Jan 2003 19:45:36 -0000
@@ -79,9 +80,9 @@
 @interface FTFontInfo : GSFontInfo <FTFontInfo>
 {
 @public
-  FTC_ImageDesc imgd;
+  FTC_ImageTypeRec imgd;
 
-  FTC_ImageDesc fallback;
+  FTC_ImageTypeRec fallback;
 
   FTFaceInfo *face_info;
 
@@ -739,7 +738,7 @@
   int use_sbit;
 
   FTC_SBit sbit;
-  FTC_ImageDesc cur;
+  FTC_ImageTypeRec cur;
 
   FT_Matrix ftmatrix;
   FT_Vector ftdelta;
@@ -789,23 +788,23 @@
 	    int rh = face_info->render_hints_hack;
 	    if (rh & 0x10000)
 	      {
-		cur.type = ftc_image_grays;
+		cur.flags = ftc_image_grays;
 		rh = (rh >> 8) & 0xff;
 	      }
 	    else
 	      {
-		cur.type = ftc_image_mono;
+		cur.flags = ftc_image_mono;
 		rh = rh & 0xff;
 	      }
 	    if (rh & 1)
-	      cur.type |= ftc_image_flag_autohinted;
+	      cur.flags |= ftc_image_flag_autohinted;
 	    if (!(rh & 2))
-	      cur.type |= ftc_image_flag_unhinted;
+	      cur.flags |= ftc_image_flag_unhinted;
 	  }
 	else if (xx < 8)
-	  cur.type = ftc_image_grays | ftc_image_flag_unhinted;
+	  cur.flags = ftc_image_grays | ftc_image_flag_unhinted;
 	else
-	  cur.type = ftc_image_grays;
+	  cur.flags = ftc_image_grays;
       }
     else
       {
@@ -1131,7 +1130,7 @@
   int use_sbit;
 
   FTC_SBit sbit;
-  FTC_ImageDesc cur;
+  FTC_ImageTypeRec cur;
 
   FT_Matrix ftmatrix;
   FT_Vector ftdelta;
@@ -1181,23 +1180,23 @@
 	    int rh = face_info->render_hints_hack;
 	    if (rh & 0x10000)
 	      {
-		cur.type = ftc_image_grays;
+		cur.flags = ftc_image_grays;
 		rh = (rh >> 8) & 0xff;
 	      }
 	    else
 	      {
-		cur.type = ftc_image_mono;
+		cur.flags = ftc_image_mono;
 		rh = rh & 0xff;
 	      }
 	    if (rh & 1)
-	      cur.type |= ftc_image_flag_autohinted;
+	      cur.flags |= ftc_image_flag_autohinted;
 	    if (!(rh & 2))
-	      cur.type |= ftc_image_flag_unhinted;
+	      cur.flags |= ftc_image_flag_unhinted;
 	  }
 	else if (xx < 8)
-	  cur.type = ftc_image_grays | ftc_image_flag_unhinted;
+	  cur.flags = ftc_image_grays | ftc_image_flag_unhinted;
 	else
-	  cur.type = ftc_image_grays;
+	  cur.flags = ftc_image_grays;
       }
     else
       {
@@ -1448,7 +1447,7 @@
       /* TODO: try to more efficiently? */
       /* TODO: set up all this stuff in -init... for the raw metric case */
       float xx, yy;
-      FTC_ImageDesc cur;
+      FTC_ImageTypeRec cur;
       FTC_SBit sbit;
 
       cur = imgd;
@@ -1461,23 +1460,23 @@
 	    int rh = face_info->render_hints_hack;
 	    if (rh & 0x10000)
 	      {
-		cur.type = ftc_image_grays;
+		cur.flags = ftc_image_grays;
 		rh = (rh >> 8) & 0xff;
 	      }
 	    else
 	      {
-		cur.type = ftc_image_mono;
+		cur.flags = ftc_image_mono;
 		rh = rh & 0xff;
 	      }
 	    if (rh & 1)
-	      cur.type |= ftc_image_flag_autohinted;
+	      cur.flags |= ftc_image_flag_autohinted;
 	    if (!(rh & 2))
-	      cur.type |= ftc_image_flag_unhinted;
+	      cur.flags |= ftc_image_flag_unhinted;
 	  }
 	else if (xx < 8)
-	  cur.type = ftc_image_grays | ftc_image_flag_unhinted;
+	  cur.flags = ftc_image_grays | ftc_image_flag_unhinted;
 	else
-	  cur.type = ftc_image_grays;
+	  cur.flags = ftc_image_grays;
 
       if (FTC_SBitCache_Lookup(ftc_sbitcache, &cur, glyph, &sbit, NULL))
 	return NSZeroSize;
@@ -1529,7 +1528,7 @@
 
 - (NSRect) boundingRectForGlyph: (NSGlyph)glyph
 {
-  FTC_ImageDesc *cur;
+  FTC_ImageTypeRec *cur;
   FT_BBox bbox;
   FT_Glyph g;
 
@@ -1600,7 +1599,7 @@
 
   FTC_SBit sbit;
 
-  FTC_ImageDesc *cur;
+  FTC_ImageTypeRec *cur;
 
 
   cmap.face_id = imgd.font.face_id;
@@ -1813,7 +1812,7 @@
   unichar *uch;
   int ulen;
 
-  FTC_ImageDesc cur;
+  FTC_ImageTypeRec cur;
 
 
   FT_Matrix ftmatrix;
@@ -1985,7 +1984,7 @@
   int use_sbit;
 
   FTC_SBit sbit;
-  FTC_ImageDesc cur;
+  FTC_ImageTypeRec cur;
 
   FT_Matrix ftmatrix;
   FT_Vector ftdelta;
@@ -2032,9 +2031,9 @@
 
 /*	if (cur.font.pix_width < 16 && cur.font.pix_height < 16 &&
 	    cur.font.pix_width > 6 && cur.font.pix_height > 6)
-	  cur.type = ftc_image_mono;
+	  cur.flags = ftc_image_mono;
 	else*/
-	  cur.type = ftc_image_grays, subpixel = YES, cur.font.pix_width *= 3, x *= 3;
+	  cur.flags = ftc_image_grays, subpixel = YES, cur.font.pix_width *= 3, x *= 3;
 //			imgd.type|=|ftc_image_flag_unhinted; /* TODO? when? */
       }
     else