[patch] Simple patch that strips out the unused variables that cause the compile to fail.

compile-fix.patch (text/plain), 2.81 KB, created by Alan on 2006-03-16 13:53:18 UTC

diff -ru src.orig/font.c src/font.c
--- src.orig/font.c	2006-02-10 13:36:32.000000000 -0800
+++ src/font.c	2006-03-16 12:36:25.000000000 -0800
@@ -696,7 +696,6 @@
 {
 	GpFont			*src_font;
 	GpFont			*result;
-	cairo_font_face_t	*face;
 	cairo_font_slant_t	slant;
 	cairo_font_weight_t	weight;
 
@@ -769,7 +768,6 @@
 gdip_create_font_from_logfont(void *hdc, void *lf, GpFont **font, bool ucs2)
 {
 	GpFont			*result;
-	cairo_font_face_t	*face;
 	cairo_font_slant_t	slant;
 	cairo_font_weight_t	weight;
 	LOGFONTA		*logfont;
Only in src.orig/: font.loT
diff -ru src.orig/graphics.c src/graphics.c
--- src.orig/graphics.c	2006-02-08 13:17:24.000000000 -0800
+++ src/graphics.c	2006-03-16 12:37:51.000000000 -0800
@@ -3372,7 +3372,6 @@
 		return Ok;
 
 
-	float			FontSize;
 
 	/* Sanity; should we check for length==0? */
 	if (!graphics || !stringUnicode || !font) {
@@ -3455,7 +3454,6 @@
 GpStatus 
 GdipGetRenderingOrigin (GpGraphics *graphics, int *x, int *y)
 {
-        double cx, cy;
 	g_return_val_if_fail (graphics != NULL, InvalidParameter);
 	g_return_val_if_fail (x != NULL, InvalidParameter);
 	g_return_val_if_fail (y != NULL, InvalidParameter);
@@ -3698,7 +3696,7 @@
 		gdip_plot_path (graphics, graphics->clip->path, graphics->aa_offset_x, graphics->aa_offset_y);
 		break;
 	default:
-		g_warning ("Unknown region type %d", graphics->clip);
+		g_warning ("Unknown region type %d", (int)graphics->clip);
 		break;
 	}
 	
Only in src.orig/: graphics.loT
diff -ru src.orig/texturebrush.c src/texturebrush.c
--- src.orig/texturebrush.c	2005-12-23 16:48:08.000000000 -0800
+++ src/texturebrush.c	2006-03-16 12:40:00.000000000 -0800
@@ -70,7 +70,7 @@
 {
 	cairo_surface_t *original;
 	cairo_surface_t *texture;
-	cairo_pattern_t *pat, *pattern;
+	cairo_pattern_t *pat;
 	GpRect *rect = brush->rectangle;
 
 	g_return_val_if_fail (rect != NULL, InvalidParameter);
@@ -114,7 +114,7 @@
 {
 	cairo_surface_t *original;
 	cairo_surface_t *texture;
-	cairo_pattern_t *pat, *pattern;
+	cairo_pattern_t *pat;
 	cairo_matrix_t tempMatrix;
 	GpRect *rect = brush->rectangle;
 	g_return_val_if_fail (rect != NULL, InvalidParameter);
@@ -173,7 +173,7 @@
 {
 	cairo_surface_t *original;
 	cairo_surface_t *texture;
-	cairo_pattern_t *pat, *pattern;
+	cairo_pattern_t *pat;
 	GpMatrix tempMatrix;
 	GpRect *rect = brush->rectangle;
 	g_return_val_if_fail (rect != NULL, InvalidParameter);
@@ -232,7 +232,7 @@
 {
 	cairo_surface_t *original;
 	cairo_surface_t *texture;
-	cairo_pattern_t *pat, *pattern;
+	cairo_pattern_t *pat;
 	GpMatrix tempMatrix;
 	GpRect *rect = brush->rectangle;
 	g_return_val_if_fail (rect != NULL, InvalidParameter);
@@ -361,8 +361,8 @@
 	cairo_t *ct;
 	cairo_pattern_t *pattern;
 	GpTexture *texture;
-	GpImage *img, *gr_img;
-	GpBitmap *bmp, *gr_bmp;
+	GpImage *img;
+	GpBitmap *bmp;
 	cairo_format_t format;
 	GpMatrix *product = NULL;
 	unsigned int width;