remove image left/top/mag from workspace saves

Author: jcupitt

TODO

@@ -1,3 +1,10 @@
+- display ctrl bar stops working in x.ws
+
+	float issue?
+
+	infobar works
+
+	rgb pipeline generation failure?
 
 - get judder with rotate and images smaller than the window
 

src/iimage.c

@@ -147,10 +147,7 @@ iimage_save(Model *model, xmlNode *xnode)
 
 	/* We always rebuild the value from the expr ... don't save.
 	 */
-	if (!set_iprop(xthis, "image_left", iimage->image_left) ||
-		!set_iprop(xthis, "image_top", iimage->image_top) ||
-		!set_iprop(xthis, "image_mag", iimage->image_mag) ||
-		!set_sprop(xthis, "show_status", bool_to_char(iimage->show_status)) ||
+	if (!set_sprop(xthis, "show_status", bool_to_char(iimage->show_status)) ||
 		!set_sprop(xthis, "show_convert", bool_to_char(iimage->show_convert)))
 		return NULL;
 
@@ -175,9 +172,6 @@ iimage_load(Model *model,
 
 	g_assert(IS_RHS(parent));
 
-	(void) get_iprop(xnode, "image_left", &iimage->image_left);
-	(void) get_iprop(xnode, "image_top", &iimage->image_top);
-	(void) get_iprop(xnode, "image_mag", &iimage->image_mag);
 	(void) get_bprop(xnode, "show_status", &iimage->show_status);
 	(void) get_bprop(xnode, "show_paintbox", &iimage->show_paintbox);
 	(void) get_bprop(xnode, "show_convert", &iimage->show_convert);
@@ -407,10 +401,6 @@ iimage_init(iImage *iimage)
 
 	iimage->views = NULL;
 
-	iimage->image_left = 0;
-	iimage->image_top = 0;
-	iimage->image_mag = 0;
-
 	iimage->show_status = FALSE;
 	iimage->show_paintbox = FALSE;
 	iimage->show_convert = FALSE;

src/iimage.h

@@ -54,12 +54,6 @@ struct _iImage {
 	 */
 	GSList *views;
 
-	/* Track display pos/size/etc. here.
-	 */
-	int image_left; /* Scroll position */
-	int image_top;
-	int image_mag; /* Scale */
-
 	/* View attachments.
 	 */
 	gboolean show_status;

src/tilesource.c

@@ -600,6 +600,8 @@ tilesource_rgb(Tilesource *tilesource, VipsImage *in)
 	VipsImage *x;
 	int n_bands;
 
+	printf("tilesource_rgb:\n");
+
 	g_autoptr(VipsImage) image = in;
 	g_object_ref(image);
 
@@ -809,9 +811,7 @@ tilesource_update_image(Tilesource *tilesource)
 		return 0;
 
 	if (!(image = tilesource_image(tilesource, &mask, tilesource->current_z))) {
-#ifdef DEBUG
 		printf("tilesource_update_image: build failed\n");
-#endif /*DEBUG*/
 		return -1;
 	}