gegl r2691 - in trunk: . bin

[ok svn gnome org]

Author: ok
Date: Sun Nov  2 23:27:11 2008
New Revision: 2691
URL: http://svn.gnome.org/viewvc/gegl?rev=2691&view=rev

Log:
* bin/gegl.c: #include "gegl-path-smooth.h"
* bin/editor.c: removed unusded variables.
* bin/Makefile.am: fix whitespace issues.


Modified:
   trunk/ChangeLog
   trunk/bin/Makefile.am
   trunk/bin/editor.c
   trunk/bin/gegl.c

Modified: trunk/bin/Makefile.am
==============================================================================
--- trunk/bin/Makefile.am	(original)
+++ trunk/bin/Makefile.am	Sun Nov  2 23:27:11 2008
@@ -40,10 +40,10 @@
 
 editor.o: editor-actions.inc
 editor-actions.inc: editor.c
-        echo ''> $@
-        for action in `cat $< | grep "^static gint [0-9a-z_A-Z]* (" | sed -e 's/^.* gint //' -e 's/ .*//'`;do \
-            echo "o(\""`echo $$action | sed -e 's/_/-/g' -e 's/action-//'`"\", $$action);" >> $@; \
-        done
+	echo ''> $@
+	for action in `cat $< | grep "^static gint [0-9a-z_A-Z]* (" | sed -e 's/^.* gint //' -e 's/ .*//'`;do \
+	    echo "o(\""`echo $$action | sed -e 's/_/-/g' -e 's/action-//'`"\", $$action);" >> $@; \
+	done
 
 CLEANFILES = editor-actions.inc bkl-tasks.inc
 

Modified: trunk/bin/editor.c
==============================================================================
--- trunk/bin/editor.c	(original)
+++ trunk/bin/editor.c	Sun Nov  2 23:27:11 2008
@@ -756,8 +756,6 @@
       gdouble linewidth;
       const GeglPathItem *knot;
       GeglPathItem new_knot;
-      gint i;
-      gint n;
       gdouble cx, cy;
 
       GeglPath *vector;
@@ -1042,11 +1040,6 @@
 
       x = tools.menux;
       y = tools.menuy;
-#if 0
-      cairo_move_to (cr, x, y);
-      cairo_arc (cr, x, y, 100, 0.0, 3.1415*2);
-      cairo_fill (cr);
-#endif
 
       {
         gint segment;
@@ -1325,8 +1318,8 @@
 
           gegl_node_get_translation (GEGL_NODE (tools.node), &tx, &ty);
 
-          ex = (event->x + x) / scale - tx;
-          ey = (event->y + y) / scale - ty;
+          ex = (event->x + x) / scale;
+          ey = (event->y + y) / scale;
 
           tools.prevx = ex;
           tools.prevy = ey;
@@ -1457,8 +1450,8 @@
 
             gegl_node_get_translation (GEGL_NODE (tools.node), &tx, &ty);
 
-            ex = (event->x + x) / scale - tx;
-            ey = (event->y + y) / scale - ty;
+            ex = (event->x + x) / scale;
+            ey = (event->y + y) / scale;
 
             move_rel (tools.node, ex-tools.prevx, ey-tools.prevy);
 

Modified: trunk/bin/gegl.c
==============================================================================
--- trunk/bin/gegl.c	(original)
+++ trunk/bin/gegl.c	Sun Nov  2 23:27:11 2008
@@ -32,6 +32,7 @@
 #ifdef HAVE_SPIRO
 #include "gegl-path-spiro.h"
 #endif
+#include "gegl-path-smooth.h"
 
 #ifdef G_OS_WIN32
 #include <direct.h>