fix load cancel

Author: jcupitt

README.md

@@ -236,17 +236,10 @@ On success, merge to master.
 
   maybe check glib master and file a bug report
 
-- load cancel does not work
-
-- duplicate of a texture view crashes ... see tile_source_duplicate()
-
 - check mem use, esp with three large images loaded
 
 - PDF page change does not change image size if pages vary in size
 
-- add some internal stuff, like pyramid shape, to props display? number of
-  loaded tiles?
-
 - ^C during a slow load leaves a file in /tmp, can we fix this?
 
 - batch save?

src/imagewindow.c

@@ -474,6 +474,9 @@ image_window_tile_source_changed(TileSource *tile_source, ImageWindow *win)
 	printf("image_window_tile_source_changed:\n");
 #endif /*DEBUG*/
 
+	if (tile_source->load_error)
+		image_window_set_error(win, tile_source->load_message);
+
 	state = g_variant_new_boolean(tile_source->falsecolour);
 	change_state(GTK_WIDGET(win), "falsecolour", state);
 
@@ -578,8 +581,6 @@ image_window_imageui_set_visible(ImageWindow *win,
 		"visible", FALSE,
 		NULL);
 
-	image_window_error_hide(win);
-
 	g_object_set(win->properties,
 		"tile-source", new_tile_source,
 		NULL);
@@ -725,10 +726,8 @@ image_window_cancel_clicked(GtkWidget *button, ImageWindow *win)
 	VipsImage *image;
 
 	if ((tile_source = image_window_get_tile_source(win)) &&
-		(image = tile_source_get_image(tile_source))) {
-		printf("image_window_cancel_clicked: set kill on image %p\n", image);
+		(image = tile_source_get_image(tile_source)))
 		vips_image_set_kill(image, TRUE);
-	}
 }
 
 static void

src/tilesource.c

@@ -63,6 +63,7 @@ tile_source_dispose(GObject *object)
 	VIPS_UNREF(tile_source->mask_region);
 
 	VIPS_FREE(tile_source->delay);
+	VIPS_FREE(tile_source->load_message);
 
 	G_OBJECT_CLASS(tile_source_parent_class)->dispose(object);
 }
@@ -966,7 +967,7 @@ tile_source_init(TileSource *tile_source)
 	tile_source->zoom = 1.0;
 }
 
-static void
+static int
 tile_source_force_load(TileSource *tile_source)
 {
 	if (tile_source->image_region &&
@@ -977,8 +978,11 @@ tile_source_force_load(TileSource *tile_source)
 		rect.top = 0;
 		rect.width = 1;
 		rect.height = 1;
-		(void) vips_region_prepare(tile_source->image_region, &rect);
+		if (vips_region_prepare(tile_source->image_region, &rect))
+			return -1;
 	}
+
+	return 0;
 }
 
 /* This runs in the main thread when the bg load is done. We can't use
@@ -1019,7 +1023,10 @@ tile_source_background_load_worker(void *data, void *user_data)
 
 	g_assert(tile_source->image_region);
 
-	tile_source_force_load(tile_source);
+	if (tile_source_force_load(tile_source)) {
+		tile_source->load_error = TRUE;
+		tile_source->load_message = vips_error_buffer_copy();
+	}
 
 	g_idle_add(tile_source_background_load_done_idle, tile_source);
 

src/tilesource.h

@@ -190,10 +190,16 @@ typedef struct _TileSource {
 	 */
 	gboolean loaded;
 
-	/* TRUE when the imageis visible. GIF animations (for example) pause for
+	/* TRUE when the image is visible. GIF animations (for example) pause for
 	 * invisible images.
 	 */
 	gboolean visible;
+
+	/* Set on a background load error, eg. cancel etc.
+	 */
+	int load_error;
+	char *load_message;
+
 } TileSource;
 
 typedef struct _TileSourceClass {