Index: gd-pango/gd_pango.h
===================================================================
RCS file: /repository/gd/gd-pango/gd_pango.h,v
retrieving revision 1.2
diff -u -r1.2 gd_pango.h
--- gd-pango/gd_pango.h	29 Dec 2006 14:52:37 -0000	1.2
+++ gd-pango/gd_pango.h	24 Apr 2008 04:08:25 -0000
@@ -51,16 +51,6 @@
 		0)
 
 /**
- * Defines a rectangle with its origin at (x,y) with width w and height h
- */
-typedef struct gdRect {
-	int x; //!< Horizontal origin
-	int y; //!< Vertical origin
-	int w; //!< Width
-	int h; //!< Height
-}gdRect;
-
-/**
  * Defines a colors set. The foreground and background can be
  * defined using a integer valuge returned by gdTrueColor(r,g,b).
  * For example, you can use when you create a gdPangoContext.
Index: gd-pango/gd_pango.c
===================================================================
RCS file: /repository/gd/gd-pango/gd_pango.c,v
retrieving revision 1.2
diff -u -r1.2 gd_pango.c
--- gd-pango/gd_pango.c	29 Dec 2006 14:52:37 -0000	1.2
+++ gd-pango/gd_pango.c	24 Apr 2008 04:08:25 -0000
@@ -286,8 +286,8 @@
 {
 	int i;
 	unsigned char *p_ft;
-	int width = rect->w;
-	int height = rect->h;
+	int width = rect->width;
+	int height = rect->height;
 	int x = rect->x;
 	int y = rect->y;
 	int color_fg, alpha_blending_back;
@@ -425,15 +425,15 @@
 							 &ink_rect, &logical_rect);
 			}
 
-			d_rect.w = (int)PANGO_PIXELS(logical_rect.width);
-			d_rect.h = (int)PANGO_PIXELS(logical_rect.height);
+			d_rect.width = (int)PANGO_PIXELS(logical_rect.width);
+			d_rect.height = (int)PANGO_PIXELS(logical_rect.height);
 			d_rect.x = (int)(x + PANGO_PIXELS (x_off));
 			d_rect.y = (int)(risen_y - baseline);
 
-			if((!context->ft2bmp) || d_rect.w + d_rect.x > context->ft2bmp->width
-				|| d_rect.h + d_rect.y > context->ft2bmp->rows) {
+			if((!context->ft2bmp) || d_rect.width + d_rect.x > context->ft2bmp->width
+				|| d_rect.height + d_rect.y > context->ft2bmp->rows) {
 				gdPangofreeFTBitmap(context->ft2bmp);
-				context->ft2bmp = gdPangoCreateFTBitmap(d_rect.w + d_rect.x, d_rect.h + d_rect.y);
+				context->ft2bmp = gdPangoCreateFTBitmap(d_rect.width + d_rect.x, d_rect.height + d_rect.y);
 			}
 
 			gdPangoRenderGlyphString(context, surface, &colors,
@@ -701,8 +701,8 @@
 
 		rect.x = 0;
 		rect.y = 0;
-		rect.w = new_w;
-		rect.h = new_h;
+		rect.width = new_w;
+		rect.height = new_h;
 
 		pango_ft2_render_layout(context->ft2bmp, context->layout, layout_x, layout_y);
 		gdPangoCopyFTBitmapToSurface(context->ft2bmp, surface, &context->default_colors, &rect);