only make tilesource when needed

Author: jcupitt

TODO

@@ -6,12 +6,6 @@
 - "reset" in display bar resets the position of scale/offset widgets, but does
   not reset the menu items (eg. tick on falsecolour)
 
-- can we make tilesource on demand in iimageview_refresh?
-
-	might speed up workspace load
-
-- we are not always refreshing thumbnails after load completes
-
 - shrink as well as expand tiles in tilecache_snapshot
 
 - long formula should truncate with an ellipsis

src/iimageview.c

@@ -133,8 +133,8 @@ iimageview_refresh(vObject *vobject)
 	Tilesource *tilesource;
 
 #ifdef DEBUG
-#endif /*DEBUG*/
 	printf("iimageview_refresh:\n");
+#endif /*DEBUG*/
 
 	// on the first refresh, register with the enclosing workspaceview
 	if (iimageview->first) {
@@ -146,45 +146,46 @@ iimageview_refresh(vObject *vobject)
 
 	iimageview_compute_visibility(iimageview);
 
-	if (iimageview->enable) {
-		if (!iimage->value.ii)
-			g_object_set(iimageview->imagedisplay,
-				"tilesource", NULL,
-				NULL);
-		else {
-			g_object_get(iimageview->imagedisplay,
-				"tilesource", &tilesource,
-				NULL);
-
-			if (!tilesource ||
-				(tilesource->image != iimage->value.ii->image)) {
-				Tilesource *new_tilesource =
-					tilesource_new_from_iimage(iimage, -1000);
+	if (!iimageview->enable ||
+		!iimage->value.ii)
+		g_object_set(iimageview->imagedisplay,
+			"tilesource", NULL,
+			NULL);
+	else if (iimageview->enable) {
+		g_object_get(iimageview->imagedisplay,
+			"tilesource", &tilesource,
+			NULL);
 
-				g_object_set(iimageview->imagedisplay,
-					"bestfit", TRUE,
-					"tilesource", new_tilesource,
-					NULL);
+		if (!tilesource ||
+			(tilesource->image != iimage->value.ii->image)) {
+			Tilesource *new_tilesource =
+				tilesource_new_from_iimage(iimage, -1000);
 
-				// set the image loading, if necessary
-				tilesource_background_load(new_tilesource);
+			g_object_set(iimageview->imagedisplay,
+				"bestfit", TRUE,
+				"tilesource", new_tilesource,
+				NULL);
 
-				VIPS_UNREF(new_tilesource);
-			}
+			// set the image loading, if necessary
+			tilesource_background_load(new_tilesource);
 
-			VIPS_UNREF(tilesource);
+			VIPS_UNREF(new_tilesource);
 		}
+
+		VIPS_UNREF(tilesource);
 	}
 
 	g_object_get(iimageview->imagedisplay,
 		"tilesource", &tilesource,
 		NULL);
-	if (tilesource)
+	if (tilesource) {
 		g_object_set(tilesource,
 			"scale", iimage->scale,
 			"offset", iimage->offset,
 			"falsecolour", iimage->falsecolour,
 			NULL);
+		VIPS_UNREF(tilesource);
+	}
 
 	if (iimageview->label)
 		set_glabel(iimageview->label, "%s", IOBJECT(iimage)->caption);