From 8e7d7063b2b9e490a5c36ba6ec2afa1c40a2e714 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 5 Nov 2011 14:20:36 +0000
Subject: [PATCH] change SMALLTILE down to 128x128

512x512 was just too big for large images
---
 ChangeLog                      |  1 +
 TODO                           | 10 ++++++++++
 libvips/include/vips/private.h | 15 +++++++--------
 libvips/iofuncs/image.c        |  1 +
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f80a36c2..34bdec09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@
 - cache.c now drops if you have too many open files
 - CLI args to change max files
 - new format for handling exif tags 
+- switch SMALLTILE to 128, 512 was just too big
 
 12/10/11 started 7.26.6
 - NOCACHE was not being set correctly on OS X causing performance 
diff --git a/TODO b/TODO
index 3994fe66..4760ab9c 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,13 @@
+- disc temps for load are not being deleted
+
+  or are they? argh
+
+  $ vips --vips-disc-threshold=10 --vips-progress copy wtc.png x.v
+
+  does not seem to make a temp at all, strange
+
+
+
 
 - don't do vips_image_write() at the end of a pipeline, instead try:
 
diff --git a/libvips/include/vips/private.h b/libvips/include/vips/private.h
index a9763cb0..d9f2c628 100644
--- a/libvips/include/vips/private.h
+++ b/libvips/include/vips/private.h
@@ -126,18 +126,17 @@ void vips_buffer_print( VipsBuffer *buffer );
  */
 typedef enum region_type {
 	VIPS_REGION_NONE,
-	VIPS_REGION_BUFFER,	/* a pixel buffer */
-	VIPS_REGION_OTHER_REGION, /* memory on another region */
-	VIPS_REGION_OTHER_IMAGE,/* memory on another image */
-	VIPS_REGION_WINDOW	/* mmap() buffer on fd on another image */
+	VIPS_REGION_BUFFER,		/* A VipsBuffer */
+	VIPS_REGION_OTHER_REGION, 	/* Memory on another region */
+	VIPS_REGION_OTHER_IMAGE,	/* Memory on another image */
+	VIPS_REGION_WINDOW		/* A VipsWindow on fd */
 } RegionType;
 
 /* Private to iofuncs: the size of the `tiles' requested by 
- * vips_image_generate()
- * when acting as a data sink.
+ * vips_image_generate() when acting as a data sink.
  */
-#define VIPS__TILE_WIDTH (512)
-#define VIPS__TILE_HEIGHT (512)
+#define VIPS__TILE_WIDTH (128)
+#define VIPS__TILE_HEIGHT (128)
 
 /* The height of the strips for the other two request styles.
  */
diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c
index a7892eae..ea0982bf 100644
--- a/libvips/iofuncs/image.c
+++ b/libvips/iofuncs/image.c
@@ -1664,6 +1664,7 @@ vips_image_new_disc_temp( const char *format )
 		g_free( name );
 		return( NULL );
 	}
+
 	g_free( name );
 
 	vips_image_set_delete_on_close( image, TRUE );