gnome-scan r629 - in trunk: . lib modules tools

[bersace svn gnome org]

Author: bersace
Date: Tue Nov 11 13:28:22 2008
New Revision: 629
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=629&view=rev

Log:
Migrate to GEGL 0.0.21.


Modified:
   trunk/ChangeLog
   trunk/lib/gnome-scan-job.c
   trunk/lib/gnome-scan-preview-sink.c
   trunk/lib/gnome-scan-processor-common.c
   trunk/modules/gsane-scanner.c
   trunk/modules/gsfile-scanner.c
   trunk/tools/gs-scrot.c

Modified: trunk/lib/gnome-scan-job.c
==============================================================================
--- trunk/lib/gnome-scan-job.c	(original)
+++ trunk/lib/gnome-scan-job.c	Tue Nov 11 13:28:22 2008
@@ -411,7 +411,7 @@
 	
 	/* convert */
 	priv->gegl_convert = gegl_node_new_child(root,
-											 "operation", "convert-format",
+											 "operation", "gegl:convert-format",
 											 NULL);
 	node = g_list_append (node, priv->gegl_convert);
 	

Modified: trunk/lib/gnome-scan-preview-sink.c
==============================================================================
--- trunk/lib/gnome-scan-preview-sink.c	(original)
+++ trunk/lib/gnome-scan-preview-sink.c	Tue Nov 11 13:28:22 2008
@@ -83,7 +83,7 @@
 	GList *list = NULL;
 
 	priv->save = gegl_node_new_child (root,
-									  "operation", "save-pixbuf",
+									  "operation", "gegl:save-pixbuf",
 									  "pixbuf", &priv->pixbuf,
 									  NULL);
 	list = g_list_append (list,

Modified: trunk/lib/gnome-scan-processor-common.c
==============================================================================
--- trunk/lib/gnome-scan-processor-common.c	(original)
+++ trunk/lib/gnome-scan-processor-common.c	Tue Nov 11 13:28:22 2008
@@ -107,14 +107,14 @@
 	GeglNode *op;
 	
 	op = gegl_node_new_child(root,
-							 "operation", "rotate",
+							 "operation", "gegl:rotate",
 							 "degrees", priv->degrees,
 							 NULL);
 	node = g_list_append (node, op);
 	
 	if (priv->enhance) {
 		op = gegl_node_new_child(root,
-								 "operation", "stress",
+								 "operation", "gegl:stress",
 								 /* those value are arbitraty, might
 									be nice to expose this through
 									profile : photo, text, quick,

Modified: trunk/modules/gsane-scanner.c
==============================================================================
--- trunk/modules/gsane-scanner.c	(original)
+++ trunk/modules/gsane-scanner.c	Tue Nov 11 13:28:22 2008
@@ -314,7 +314,7 @@
 	GList* list = NULL;
 	
 	priv->load = gegl_node_new_child (root,
-					  "operation", "load-buffer",
+					  "operation", "gegl:load-buffer",
 					  "buffer", priv->buffer,
 					  NULL);
 	list = g_list_append (list, priv->load);
@@ -579,7 +579,7 @@
 	
 	buf = g_new0 (SANE_Byte, priv->chunk_len);
 	status = sane_read (priv->handle, buf, priv->chunk_len, &len);
-	
+
 	/* start new frame for three pass acquisition */
 	if (status == SANE_STATUS_EOF && !priv->params.last_frame) {
 		g_free (buf);
@@ -622,7 +622,7 @@
 	
 	if (processor)
 		processor(gss, &rect, format, buf, len);
-	
+
 	g_free (buf);
 	priv->bytes_read+= len;
 	
@@ -1157,7 +1157,6 @@
 	
 	status = sane_control_option (GET_PRIVATE (gss)->handle, n,
 				      SANE_ACTION_SET_VALUE, v, &i);
-	
 	return i;
 }
 

Modified: trunk/modules/gsfile-scanner.c
==============================================================================
--- trunk/modules/gsfile-scanner.c	(original)
+++ trunk/modules/gsfile-scanner.c	Tue Nov 11 13:28:22 2008
@@ -162,7 +162,7 @@
 	GList *list = NULL;
 	
 	priv->load = gegl_node_new_child (root,
-									  "operation", "load",
+									  "operation", "gegl:load",
 									  NULL);
 	
 	list = g_list_append (list, priv->load);

Modified: trunk/tools/gs-scrot.c
==============================================================================
--- trunk/tools/gs-scrot.c	(original)
+++ trunk/tools/gs-scrot.c	Tue Nov 11 13:28:22 2008
@@ -365,12 +365,12 @@
   root = gegl_node_new ();
 	
   color = gegl_node_new_child (root,
-			       "operation", "color",
+			       "operation", "gegl:color",
 			       "value", gegl_color_new ("white"),
 			       NULL);
 	
   crop = gegl_node_new_child (root,
-			      "operation", "crop",
+			      "operation", "gegl:crop",
 			      "x", 0.,
 			      "y", 0.,
 			      "width", W,
@@ -378,15 +378,15 @@
 			      NULL);
 	
   over = gegl_node_new_child (root,
-			      "operation", "over",
+			      "operation", "gegl:over",
 			      NULL);
 	
   over1 = gegl_node_new_child (root,
-			       "operation", "over",
+			       "operation", "gegl:over",
 			       NULL);
 	
   crop1 = gegl_node_new_child (root,
-			       "operation", "crop",
+			       "operation", "gegl:crop",
 			       "x", 0.,
 			       "y", 0.,
 			       "width", W,
@@ -394,14 +394,14 @@
 			       NULL);
 	
   shift = gegl_node_new_child (root,
-			       "operation", "shift",
+			       "operation", "gegl:shift",
 			       "x", LEN,
 			       "y", LEN,
 			       NULL);
 	
 	
   save = gegl_node_new_child (root,
-			      "operation", "png-save",
+			      "operation", "gegl:png-save",
 			      "path", filename,
 			      NULL);
 	
@@ -410,13 +410,13 @@
 	
   /* border */
   bg = gegl_node_new_child (root,
-			    "operation", "color",
+			    "operation", "gegl:color",
 			    NULL);
 	
 	
   if (GTK_IS_WINDOW (widget)) {
     crop2 = gegl_node_new_child (root,
-				 "operation", "crop",
+				 "operation", "gegl:crop",
 				 "x", 0.,
 				 "y", 0.,
 				 "width", (gdouble) w,
@@ -425,7 +425,7 @@
   }
   else {
     crop2 = gegl_node_new_child (root,
-				 "operation", "crop",
+				 "operation", "gegl:crop",
 				 "x", 0.,
 				 "y", 0.,
 				 "width", (gdouble) w + 2.,
@@ -434,7 +434,7 @@
   }
 	
   shadow = gegl_node_new_child (over,
-				"operation", "dropshadow",
+				"operation", "gegl:dropshadow",
 				"opacity", .9,
 				"x", LEN,
 				"y", LEN,
@@ -446,18 +446,18 @@
 	
   /* image */
   load = gegl_node_new_child (over1,
-			      "operation", "pixbuf",
+			      "operation", "gegl:pixbuf",
 			      "pixbuf", screenshot,
 			      NULL);
 	
   if (GTK_IS_WINDOW (widget)) {
     shift1 = gegl_node_new_child (over1,
-				  "operation", "nop",
+				  "operation", "gegl:nop",
 				  NULL);
   }
   else {
     shift1 = gegl_node_new_child (over1,
-				  "operation", "shift",
+				  "operation", "gegl:shift",
 				  "x", 1.,
 				  "y", 1.,
 				  NULL);