[xiph-commits] r12444 - trunk/sushivision

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-02-07 21:11:01 -0800 (Wed, 07 Feb 2007)
New Revision: 12444

Modified:
   trunk/sushivision/panel-2d.c
Log:
Temporarily remove async fast scale; the basis for it as implemented was 
incorrect



Modified: trunk/sushivision/panel-2d.c
===================================================================
--- trunk/sushivision/panel-2d.c	2007-02-08 05:05:44 UTC (rev 12443)
+++ trunk/sushivision/panel-2d.c	2007-02-08 05:11:01 UTC (rev 12444)
@@ -1019,7 +1019,7 @@
 
   // lock during setup
   gdk_threads_enter ();
-  serialno = ++p2->serialno;
+  serialno = ++p2->serialno; // we're about to free the old data rectangles
   plot = PLOT(p->private->graph);
   pw = plot->x.pixels;
   ph = plot->y.pixels;
@@ -1076,7 +1076,7 @@
 	int j;
 	
 	p2->y_map[i] = NULL;
-	gdk_threads_leave ();
+	//gdk_threads_leave ();
 	
 	for(j=0;j<sx_v.pixels*sy_v.pixels;j++)
 	  newmap[j]=NAN;
@@ -1088,12 +1088,12 @@
 	  free(oldmap);
 	}
 	
-	gdk_threads_enter ();
-	if(p2->serialno != serialno){
-	  gdk_threads_leave();
-	  return 1;
-	}
-	p2->y_map[i] = newmap;
+	//gdk_threads_enter ();
+	//if(p2->serialno != serialno){
+	//  gdk_threads_leave();
+	//  return 1;
+	//}
+	p2->y_map[i] = newmap; 
       }
       
       p2->scaling_in_progress = 0;