From 3f93f60d9100e0d01a04129ca8e26b1a65b3de30 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 25 Oct 2011 15:44:54 +0100
Subject: [PATCH] fix im_copy_set()

---
 TODO                    | 45 ++++++++++++++++++++++++++++++++++++++++-
 libvips/iofuncs/image.c | 37 +++++++++++++++++++++------------
 2 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/TODO b/TODO
index c637a977..f4b1c0d6 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,52 @@
-- vips im_copy_set /home/john/GIT/nip2/test/tmp/t1.v
+- (gdb) run im_extract_band babe.jpg x.jpg 1
+VIPS-WARNING **: object.c:763: VipsImage can't assign 'width' after construct
+
+  problem is that we create an output image like
+
+  	VipsImage *im = vips_image_new_mode( "poop.jpg", "w" );
+
+  which will run _build() on it, then at some later point set width/height
+  when we write to it
+
+  so the lifetime of an object is
+
+	  new
+	  set base params
+	  build
+	  set more params
+	  write
+	  ... and now it's frozen and read-only, except for things like "kill"
+	  unref
+
+  we have 
+
+	gboolean constructed;		/* Construct done and checked */
+
+  I suppose we need to add
+
+	gboolean written;		/* Object done and frozen */
+
+  and a "written" virtual method I guess
+
+  this seems like a big change :-( can we avoid it?
+
+  bodge it for now, fix properly after we merge
+
+
+
+
+
+
+
+vips im_copy_set /home/john/GIT/nip2/test/tmp/t1.v
   /home/john/GIT/nip2/test/tmp/cmyk.v 15 1 1 0 0
 
   VIPS-WARNING **: object.c:775: VipsImage can only assign 'xoffset' once
 
 
+HH
+
+
 
 
 
diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c
index 4ba02e3a..ca34b7c1 100644
--- a/libvips/iofuncs/image.c
+++ b/libvips/iofuncs/image.c
@@ -949,87 +949,98 @@ vips_image_class_init( VipsImageClass *class )
 	/* Create properties.
 	 */
 
+	/* It'd be good to have these as set once at construct time, but we
+	 * can't :-( 
+	 *
+	 * For example, a "p" image might be made with vips_image_new() and
+	 * constructed, then passed to im_copy() of whatever to be written to.
+	 * That operation will then need to set width/height etc.
+	 *
+	 * We can't set_once either, since im_copy_set() etc. need to update
+	 * xoffset and friends on the way through.
+	 */
+
 	VIPS_ARG_INT( class, "width", 2, 
 		_( "Width" ), 
 		_( "Image width in pixels" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Xsize ),
 		0, 1000000, 0 );
 
 	VIPS_ARG_INT( class, "height", 3, 
 		_( "Height" ), 
 		_( "Image height in pixels" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Ysize ),
 		0, 1000000, 0 );
 
 	VIPS_ARG_INT( class, "bands", 4, 
 		_( "Bands" ), 
 		_( "Number of bands in image" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Bands ),
 		0, 1000000, 0 );
 
 	VIPS_ARG_ENUM( class, "format", 5, 
 		_( "Format" ), 
 		_( "Pixel format in image" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, BandFmt ),
 		VIPS_TYPE_BAND_FORMAT, VIPS_FORMAT_UCHAR ); 
 
 	VIPS_ARG_ENUM( class, "coding", 6, 
 		_( "Coding" ), 
 		_( "Pixel coding" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Coding ),
 		VIPS_TYPE_CODING, VIPS_CODING_NONE ); 
 
 	VIPS_ARG_ENUM( class, "interpretation", 7, 
 		_( "Interpretation" ), 
 		_( "Pixel interpretation" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Type ),
 		VIPS_TYPE_INTERPRETATION, VIPS_INTERPRETATION_MULTIBAND ); 
 
 	VIPS_ARG_DOUBLE( class, "xres", 8, 
 		_( "Xres" ), 
 		_( "Horizontal resolution in pixels/mm" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Xres ),
 		0, 1000000, 0 );
 
 	VIPS_ARG_DOUBLE( class, "yres", 9, 
 		_( "Yres" ), 
 		_( "Vertical resolution in pixels/mm" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Yres ),
 		0, 1000000, 0 );
 
 	VIPS_ARG_INT( class, "xoffset", 10, 
 		_( "Xoffset" ), 
 		_( "Horizontal offset of origin" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Xoffset ),
 		-1000000, 1000000, 0 );
 
 	VIPS_ARG_INT( class, "yoffset", 11, 
 		_( "Yoffset" ), 
 		_( "Vertical offset of origin" ),
-		VIPS_ARGUMENT_SET_ONCE,
+		VIPS_ARGUMENT_NONE,
 		G_STRUCT_OFFSET( VipsImage, Yoffset ),
 		-1000000, 1000000, 0 );
 
 	VIPS_ARG_STRING( class, "filename", 12, 
 		_( "Filename" ),
 		_( "Image filename" ),
-		VIPS_ARGUMENT_CONSTRUCT, 
+		VIPS_ARGUMENT_SET_ONCE | VIPS_ARGUMENT_CONSTRUCT, 
 		G_STRUCT_OFFSET( VipsImage, filename ),
 		NULL );
 
 	VIPS_ARG_STRING( class, "mode", 13, 
 		_( "Mode" ),
 		_( "Open mode" ),
-		VIPS_ARGUMENT_CONSTRUCT, 
+		VIPS_ARGUMENT_SET_ONCE | VIPS_ARGUMENT_CONSTRUCT, 
 		G_STRUCT_OFFSET( VipsImage, mode ),
 		"p" );
 
@@ -1043,7 +1054,7 @@ vips_image_class_init( VipsImageClass *class )
 	VIPS_ARG_ENUM( class, "demand", 15, 
 		_( "Demand style" ), 
 		_( "Preferred demand style for this image" ),
-		VIPS_ARGUMENT_NONE,
+		VIPS_ARGUMENT_CONSTRUCT,
 		G_STRUCT_OFFSET( VipsImage, dhint ),
 		VIPS_TYPE_DEMAND_STYLE, VIPS_DEMAND_STYLE_SMALLTILE );