gnome-scan r621 - in trunk: . lib modules

[bersace svn gnome org]

Author: bersace
Date: Sat Aug  9 13:18:57 2008
New Revision: 621
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=621&view=rev

Log:
Fix build issue with max().


Modified:
   trunk/ChangeLog
   trunk/lib/gnome-scan-common.vala
   trunk/modules/gsane-meta-param.c

Modified: trunk/lib/gnome-scan-common.vala
==============================================================================
--- trunk/lib/gnome-scan-common.vala	(original)
+++ trunk/lib/gnome-scan-common.vala	Sat Aug  9 13:18:57 2008
@@ -137,7 +137,7 @@
 			public double	width;
 			public double	height;
 
-			private	double max(double a, double b)
+			private static double max(double a, double b)
 			{
 				return a > b ? a : b;
 			}

Modified: trunk/modules/gsane-meta-param.c
==============================================================================
--- trunk/modules/gsane-meta-param.c	(original)
+++ trunk/modules/gsane-meta-param.c	Sat Aug  9 13:18:57 2008
@@ -360,41 +360,42 @@
 	return TRUE;
 }
 
-GnomeScanRectangle*
-gs_rectangle_rotate(GnomeScanRectangle *r,
-					GnomeScanRectangle *a,
-					guint angle)
-{
-	GnomeScanRectangle *res = g_memdup(r, sizeof(GnomeScanRectangle));
-	angle%= 360;
-	
-	switch (angle)
-		{
-		case 0:
-			break;
-		case 270:
-			res->width = r->height;
-			res->height = r->width;
-			res->x = r->y;
-			res->y = a->width - r->x - r->width;
-			break;
-		case 180:
-			res->x = a->width - r->x - r->width;
-			res->y = a->height - r->y - r->height;
-			break;
-		case 90:
-			res->width = r->height;
-			res->height = r->width;
-			res->y = r->x;
-			res->x = a->height - r->y - r->height;
-			break;
-		default:
-			g_warning("%s: %i degree rotation is not supported",
-					  __FUNCTION__, angle);
-			break;
-		}
-	return res;
-}
+/* GnomeScanRectangle* */
+/* gs_rectangle_rotate(GnomeScanRectangle *r, */
+/* 					GnomeScanRectangle *a, */
+/* 					guint angle) */
+/* { */
+/* 	GnomeScanRectangle *res = g_memdup(r, sizeof(GnomeScanRectangle)); */
+/* 	angle%= 360; */
+	
+/* 	switch (angle) */
+/* 		{ */
+/* 		case 0: */
+/* 			break; */
+/* 		case 270: */
+/* 			res->width = r->height; */
+/* 			res->height = r->width; */
+/* 			res->x = r->y; */
+/* 			res->y = a->width - r->x - r->width; */
+/* 			break; */
+/* 		case 180: */
+/* 			res->x = a->width - r->x - r->width; */
+/* 			res->y = a->height - r->y - r->height; */
+/* 			break; */
+/* 		case 90: */
+/* 			res->width = r->height; */
+/* 			res->height = r->width; */
+/* 			res->y = r->x; */
+/* 			res->x = a->height - r->y - r->height; */
+/* 			break; */
+/* 		default: */
+/* 			g_warning("%s: %i degree rotation is not supported", */
+/* 					  __FUNCTION__, angle); */
+/* 			break; */
+/* 		} */
+/* 	return res; */
+/* } */
+
 static SANE_Int
 mpps_set_roi(MetaParam *mp)
 {