gegl r2213 - in trunk: . gegl/graph gegl/process

[ok svn gnome org]

Author: ok
Date: Mon Apr 21 13:28:40 2008
New Revision: 2213
URL: http://svn.gnome.org/viewvc/gegl?rev=2213&view=rev

Log:
Removed/disabled misc bits of broken mp code that snuck into svn.
* gegl/graph/gegl-node.c: (gegl_node_get_bounding_box):
* gegl/process/Makefile.am:
* gegl/process/gegl-eval-mgr.c: (gegl_eval_mgr_apply):


Modified:
   trunk/ChangeLog
   trunk/gegl/graph/gegl-node.c
   trunk/gegl/process/Makefile.am
   trunk/gegl/process/gegl-eval-mgr.c

Modified: trunk/gegl/graph/gegl-node.c
==============================================================================
--- trunk/gegl/graph/gegl-node.c	(original)
+++ trunk/gegl/graph/gegl-node.c	Mon Apr 21 13:28:40 2008
@@ -40,8 +40,10 @@
 
 #include "process/gegl-eval-mgr.h"
 #include "process/gegl-have-visitor.h"
+#if ENABLE_MP
 #include "process/gegl-lock-visitor.h"
 #include "process/gegl-unlock-visitor.h"
+#endif
 #include "process/gegl-prepare-visitor.h"
 #include "process/gegl-finish-visitor.h"
 #include "process/gegl-processor.h"
@@ -1482,8 +1484,10 @@
   GeglVisitor  *prepare_visitor;
   GeglVisitor  *have_visitor;
   GeglVisitor  *finish_visitor;
+#if ENABLE_MP
   GeglVisitor  *lock_visitor;
   GeglVisitor  *unlock_visitor;
+#endif
 
   guchar       *id;
   gint          i;
@@ -1502,12 +1506,12 @@
   g_object_ref (root);
 
   id = g_malloc (1);
-if (0)
-  {
+
+#if ENABLE_MP
   lock_visitor = g_object_new (GEGL_TYPE_LOCK_VISITOR, "id", id, NULL);
   gegl_visitor_dfs_traverse (lock_visitor, GEGL_VISITABLE (root));
   g_object_unref (lock_visitor);
-  }
+#endif
 
   for (i = 0; i < 2; i++)
     {
@@ -1524,11 +1528,11 @@
   gegl_visitor_dfs_traverse (finish_visitor, GEGL_VISITABLE (root));
   g_object_unref (finish_visitor);
 
-  if(0) {
+#if ENABLE_MP
   unlock_visitor = g_object_new (GEGL_TYPE_UNLOCK_VISITOR, "id", id, NULL);
   gegl_visitor_dfs_traverse (unlock_visitor, GEGL_VISITABLE (root));
   g_object_unref (unlock_visitor);
-  }
+#endif
 
   g_object_unref (root);
   g_free (id);

Modified: trunk/gegl/process/Makefile.am
==============================================================================
--- trunk/gegl/process/Makefile.am	(original)
+++ trunk/gegl/process/Makefile.am	Mon Apr 21 13:28:40 2008
@@ -7,11 +7,9 @@
 	gegl-eval-visitor.c		\
 	gegl-finish-visitor.c		\
 	gegl-have-visitor.c		\
-	gegl-lock-visitor.c		\
 	gegl-need-visitor.c		\
 	gegl-prepare-visitor.c		\
-	gegl-processor.c		\
-	gegl-unlock-visitor.c
+	gegl-processor.c
 
 
 
@@ -22,11 +20,9 @@
 	gegl-eval-visitor.h		\
 	gegl-finish-visitor.h		\
 	gegl-have-visitor.h		\
-	gegl-lock-visitor.h		\
 	gegl-need-visitor.h		\
 	gegl-prepare-visitor.h		\
-	gegl-processor.h		\
-	gegl-unlock-visitor.h
+	gegl-processor.h
 
 
 libprocess_la_SOURCES = $(PROCESS_sources) $(PROCESS_headers)

Modified: trunk/gegl/process/gegl-eval-mgr.c
==============================================================================
--- trunk/gegl/process/gegl-eval-mgr.c	(original)
+++ trunk/gegl/process/gegl-eval-mgr.c	Mon Apr 21 13:28:40 2008
@@ -29,8 +29,10 @@
 #include "gegl-cr-visitor.h"
 #include "gegl-have-visitor.h"
 #include "gegl-need-visitor.h"
+#if ENABLE_MP
 #include "gegl-lock-visitor.h"
 #include "gegl-unlock-visitor.h"
+#endif
 #include "gegl-instrument.h"
 #include "graph/gegl-node.h"
 #include "gegl-prepare-visitor.h"
@@ -102,11 +104,9 @@
   g_object_ref (root);
 
 #if ENABLE_MP
-    if(0){
       GeglVisitor *lock_visitor = g_object_new (GEGL_TYPE_LOCK_VISITOR, "id", context_id, NULL);
       gegl_visitor_dfs_traverse (lock_visitor, GEGL_VISITABLE (root));
       g_object_unref (lock_visitor);
-    }
 #endif
 
   for (i = 0; i < 2; i++)
@@ -121,11 +121,9 @@
   g_object_unref (have_visitor);
 
 #if ENABLE_MP
-  if(0){
     GeglVisitor *unlock_visitor = g_object_new (GEGL_TYPE_UNLOCK_VISITOR, "id", context_id, NULL);
     gegl_visitor_dfs_traverse (unlock_visitor, GEGL_VISITABLE (root));
     g_object_unref (unlock_visitor);
-  }
 #endif