fix a possible infobar race

Author: jcupitt

TODO

@@ -1,8 +1,35 @@
-- nip4 ~/pics/nipguide.pdf, set "toilet roll", then set "multipage", height is
-  wrong
+- try:
+
+	nip4 k2.jpg
+	alt-R
+	segv in infobar_status_update()
+
+
+- try:
+
+	nip4 ~/pics/S000_t000002_V000_R0000_X000_Y000_C02_I1_D0_P00101.tif
+
+  incredibly slow, in fact does not draw at all, and it's not clear why
+
+  this takes under 2s to draw the image:
+
+image = pyvips.Image.new_from_file(sys.argv[1], n=-1);
+
+	page_width = image.width
+	page_height = image.get("page-height")
+
+	pages = [image.crop(0, y * page_height, page_width, page_height)
+		 for y in range(3)]
+
+	rgb = pages[0].bandjoin(pages[1:])
+
+	rgb = rgb.copy(interpretation="rgb16")
+
+	rgb.write_to_file(sys.argv[2])
+
+
+
 
-- nip4 ~/pics/S000_t000002_V000_R0000_X000_Y000_C02_I1_D0_P00101.tif, set
-  "multipage", does not display correctly
 
 - alt-L and R for a while, coredump
 

src/gtk/nip4.css

@@ -88,3 +88,4 @@
   margin-left: 4px;
   margin-right: 4px;
 }
+

src/imagedisplay.c

@@ -30,9 +30,9 @@
 #include "nip4.h"
 
 /*
- */
 #define DEBUG_VERBOSE
 #define DEBUG
+ */
 
 // the focus colour we paint
 // FIXME ... we should somehow get this from the theme, I'm not sure how
@@ -649,6 +649,8 @@ imagedisplay_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
 	printf("imagedisplay_snapshot:\n");
 #endif /*DEBUG*/
 
+	GTK_WIDGET_CLASS(imagedisplay_parent_class)->snapshot(widget, snapshot);
+
 	/* Clip to the widget area, or we may paint over the display control
 	 * bar.
 	 */
@@ -670,7 +672,6 @@ imagedisplay_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
 
 	/* It's unclear how to do this :( maybe we're supposed to get the base
 	 * widget class to do it? Draw it ourselves for now.
-	 */
 	if (gtk_widget_has_focus(widget)) {
 		GskRoundedRect outline;
 
@@ -687,6 +688,7 @@ imagedisplay_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
 			(float[4]){ 2, 2, 2, 2 },
 			(GdkRGBA[4]){ BORDER, BORDER, BORDER, BORDER });
 	}
+	 */
 }
 
 static void

src/infobar.c

@@ -180,7 +180,7 @@ infobar_status_value_set_array(Infobar *infobar, double *d)
 typedef struct _PixelUpdate {
 	// what we update, where we get the pixel data
 	Infobar *infobar;
-	Tilesource *tilesource;
+	VipsImage *image;
 
 	// fetch params
 	int image_x;
@@ -196,7 +196,7 @@ infobar_update_free(PixelUpdate *update)
 	update->infobar->updating = FALSE;
 
 	VIPS_UNREF(update->infobar);
-	VIPS_UNREF(update->tilesource);
+	VIPS_UNREF(update->image);
 	VIPS_FREE(update->vector);
 	VIPS_FREE(update);
 }
@@ -220,9 +220,22 @@ static void
 infobar_get_pixel(void *a, void *b)
 {
 	PixelUpdate *update = (PixelUpdate *) a;
+	VipsImage *image = update->image;
 
-	update->result = tilesource_get_pixel(update->tilesource,
-		update->image_x, update->image_y, &update->vector, &update->n);
+	/* Block outside the image.
+	 */
+	if (update->image_x >= 0 &&
+		update->image_y >= 0 &&
+		update->image_x < image->Xsize &&
+		update->image_y < image->Ysize)
+		/* Fetch from image, even though this can be very slow.
+		 * This is run in a bg thread, so speed should not matter too much.
+		 */
+		update->result = !vips_getpoint(image,
+				&update->vector, &update->n,
+				update->image_x, update->image_y,
+				"unpack_complex", TRUE,
+				NULL);
 
 	g_idle_add(infobar_update_pixel_idle, update);
 }
@@ -232,18 +245,24 @@ static void
 infobar_update_pixel(Infobar *infobar,
 	Tilesource *tilesource, double image_x, double image_y)
 {
-	if (!infobar->updating) {
-		PixelUpdate *update = g_new0(PixelUpdate, 1);
+	if (!infobar->updating &&
+		tilesource->image) {
+		infobar->updating = TRUE;
 
+		PixelUpdate *update = g_new0(PixelUpdate, 1);
 		update->infobar = infobar;
-		update->tilesource = tilesource;
-		update->image_x = image_x;
-		update->image_y = image_y;
-		infobar->updating = TRUE;
+		update->image = tilesource->image;
+
+		/* Currently in level0 image coordinates ... we will fetch from
+		 * tilesource->image, the current pyr layer.
+		 */
+		int factor = tilesource->image_width / tilesource->image->Xsize;
+		update->image_x = image_x / factor;
+		update->image_y = image_y / factor;
 
 		// must stay valid until we are done
 		g_object_ref(update->infobar);
-		g_object_ref(update->tilesource);
+		g_object_ref(update->image);
 
 		if (vips_thread_execute("pixel", infobar_get_pixel, update))
 			// if we can't run a bg task, we must free the update
@@ -266,16 +285,16 @@ infobar_status_update(Infobar *infobar)
 
 	Tilesource *tilesource = imagewindow_get_tilesource(infobar->win);
 	imagewindow_get_mouse_position(infobar->win, &image_x, &image_y);
-	image_x = VIPS_CLIP(0, (int) image_x, tilesource->image->Xsize - 1);
-	image_y = VIPS_CLIP(0, (int) image_y, tilesource->image->Ysize - 1);
 
-	vips_buf_appendf(&buf, "%d", (int) image_x);
-	gtk_label_set_text(GTK_LABEL(infobar->x), vips_buf_all(&buf));
-	vips_buf_rewind(&buf);
+	if (tilesource->image) {
+		vips_buf_appendf(&buf, "%d", (int) image_x);
+		gtk_label_set_text(GTK_LABEL(infobar->x), vips_buf_all(&buf));
+		vips_buf_rewind(&buf);
 
-	vips_buf_appendf(&buf, "%d", (int) image_y);
-	gtk_label_set_text(GTK_LABEL(infobar->y), vips_buf_all(&buf));
-	vips_buf_rewind(&buf);
+		vips_buf_appendf(&buf, "%d", (int) image_y);
+		gtk_label_set_text(GTK_LABEL(infobar->y), vips_buf_all(&buf));
+		vips_buf_rewind(&buf);
+	}
 
 	double zoom = imagewindow_get_zoom(infobar->win);
 	vips_buf_appendf(&buf, "Magnification %d%%", (int) rint(zoom * 100));

src/tilecache.c

@@ -30,10 +30,10 @@
 #include "nip4.h"
 
 /*
- */
 #define DEBUG_RENDER_TIME
 #define DEBUG_VERBOSE
 #define DEBUG
+ */
 
 enum {
 	/* Properties.

src/tilesource.c

@@ -28,10 +28,10 @@
  */
 
 /*
- */
 #define DEBUG_VERBOSE
 #define DEBUG
 #define DEBUG_MAKE
+ */
 
 #include "nip4.h"
 
@@ -2073,33 +2073,6 @@ tilesource_get_base_image(Tilesource *tilesource)
 	return tilesource->base;
 }
 
-gboolean
-tilesource_get_pixel(Tilesource *tilesource, int image_x, int image_y,
-	double **vector, int *n)
-{
-	if (!tilesource->loaded ||
-		!tilesource->image)
-		return FALSE;
-
-	/* Block outside the image.
-	 */
-	if (image_x < 0 ||
-		image_y < 0 ||
-		image_x >= tilesource->image->Xsize ||
-		image_y >= tilesource->image->Ysize)
-		return FALSE;
-
-	/* Fetch from image (not ->display), even though this can be very slow.
-	 * This is run in a bg thread, so speed should not matter too much.
-	 */
-	if (vips_getpoint(tilesource->image, vector, n, image_x, image_y,
-			"unpack_complex", TRUE,
-			NULL))
-		return FALSE;
-
-	return TRUE;
-}
-
 void
 tilesource_set_synchronous(Tilesource *tilesource, gboolean synchronous)
 {

src/tilesource.h

@@ -319,8 +319,6 @@ GFile *tilesource_get_file(Tilesource *tilesource);
 
 VipsImage *tilesource_get_image(Tilesource *tilesource);
 VipsImage *tilesource_get_base_image(Tilesource *tilesource);
-gboolean tilesource_get_pixel(Tilesource *tilesource,
-	int image_x, int image_y, double **vector, int *n);
 Tilesource *tilesource_duplicate(Tilesource *tilesource);
 void tilesource_changed(Tilesource *tilesource);