fix compile errors

jcupitt · jcupitt · commit f8bdc9a990f9 · 2022-04-12T14:33:05.000+01:00
diff --git a/libvips/include/vips/object.h b/libvips/include/vips/object.h
@@ -197,19 +197,6 @@ VIPS_ARGUMENT_OPTIONAL_OUTPUT   Eg. the x pos of the image minimum
 		pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET) ); \
 }
 
-#define VIPS_ARG_INT64( CLASS, NAME, PRIORITY, LONG, DESC, \
-	FLAGS, OFFSET, MIN, MAX, VALUE ) { \
-	GParamSpec *pspec; \
-	\
-	pspec = g_param_spec_int64( (NAME), (LONG), (DESC), \
-		(MIN), (MAX), (VALUE), \
-		(GParamFlags) (G_PARAM_READWRITE) );\
-	g_object_class_install_property( G_OBJECT_CLASS( CLASS ), \
-		vips_argument_get_id(), pspec ); \
-	vips_object_class_install_argument( VIPS_OBJECT_CLASS( CLASS ), \
-		pspec, (VipsArgumentFlags) (FLAGS), (PRIORITY), (OFFSET) ); \
-}
-
 #define VIPS_ARG_ENUM( CLASS, NAME, PRIORITY, LONG, DESC, \
 	FLAGS, OFFSET, TYPE, VALUE ) { \
 	GParamSpec *pspec; \
diff --git a/libvips/iofuncs/configure.c b/libvips/iofuncs/configure.c
@@ -165,40 +165,35 @@ vips_configure_class_init( VipsConfigureClass *class )
 		_( "Set threadpool size" ),
 		VIPS_ARGUMENT_OPTIONAL_INPUT,
 		G_STRUCT_OFFSET( VipsConfigure, concurrency ),
-		-1 );
+		0, 0, 1024 );
 
-	VIPS_ARG_INT64( class, "pipe_read_limit", 5, 
+	VIPS_ARG_UINT64( class, "pipe_read_limit", 6, 
 		_( "Pipe read limit" ), 
 		_( "Maxiumum number of bytes to buffer for pipe read" ),
 		VIPS_ARGUMENT_OPTIONAL_INPUT,
 		G_STRUCT_OFFSET( VipsConfigure, pipe_read_limit ),
-		-1 );
+		0, 1024L * 1024L * 1024L, 1024L * 1024L * 1024L * 1024L ); 
 
-	VIPS_ARG_INT( class, "cache_max", 5, 
+	VIPS_ARG_INT( class, "cache_max", 7, 
 		_( "Cache max size" ), 
 		_( "Maxium number of operations to cache" ),
 		VIPS_ARGUMENT_OPTIONAL_INPUT,
 		G_STRUCT_OFFSET( VipsConfigure, cache_max ),
-		-1 );
+		0, 100, 100000 );
 
-	VIPS_ARG_INT( class, "cache_max_mem", 5, 
+	VIPS_ARG_UINT64( class, "cache_max_mem", 8, 
 		_( "Cache max memory size" ), 
-		_( "Maxium number of operations to cache" ),
+		_( "Maxium amount of memory for the operation cache" ),
 		VIPS_ARGUMENT_OPTIONAL_INPUT,
 		G_STRUCT_OFFSET( VipsConfigure, cache_max ),
-		-1 );
-
-	/* Number of recent operations to cache.
-	 */
-	int cache_max;
-
-	/* Maximum memory to use for operation caching.
-	 */
-	int64 cache_max_mem;
+		0, 100 * 1024L * 1024L, 1024L * 1024L * 1024L * 1024L ); 
 
-	/* Maximum number of open files we allow in the cache.
-	 */
-	int cache_max_files;
+	VIPS_ARG_INT( class, "cache_max_files", 9, 
+		_( "Cache max open files" ), 
+		_( "Maxium number of open files in operation cache" ),
+		VIPS_ARGUMENT_OPTIONAL_INPUT,
+		G_STRUCT_OFFSET( VipsConfigure, cache_max_files ),
+		0, 100, 100000 );
 
 }
 
diff --git a/libvips/iofuncs/source.c b/libvips/iofuncs/source.c
@@ -1,3 +1,4 @@
+/* A byte source/sink .. it can be a pipe, file descriptor, memory area,
  * socket, node.js stream, etc.
  * 
  * 19/6/14

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* A byte source/sink .. it can be a pipe, file descriptor, memory area,`
`1`	`2`	`* socket, node.js stream, etc.`
`2`	`3`	`*`
`3`	`4`	`* 19/6/14`