From 823650b2b47175a1898ad2a0c61d92ccdc26aa6c Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 24 Jan 2011 10:40:40 +0000
Subject: [PATCH] oops

---
 ChangeLog              |  1 +
 TODO                   | 10 ++++++++++
 libvips/mask/rw_mask.c | 15 +++++++++------
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1fc2702..b8aa8b6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 - don't use tables for bilinear on float data for a small speedup (thanks
   Nicolas Robidoux)
 - no tables for uchar either, about a 15% speedup (thanks Nicolas)
+- dmask write was broken
 
 30/11/10 started 7.24.0
 - bump for new stable
diff --git a/TODO b/TODO
index f80b3207..3dac8f03 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,13 @@
+
+
+
+- im__open_write() should take a mode (text / binary)
+
+  rw_mask.c has copies of im__open_write() etc. which use text mode, remove
+  them
+
+
+
 - use |_O_TEMPORARY to open()'s mode on Windows for tmpfiles to increase the
   chances we actually delete
 
diff --git a/libvips/mask/rw_mask.c b/libvips/mask/rw_mask.c
index a1e163a4..eddabafd 100644
--- a/libvips/mask/rw_mask.c
+++ b/libvips/mask/rw_mask.c
@@ -47,11 +47,13 @@
  * 	  error messagge
  * 21/10/10
  * 	- gtk-doc
- * 	- you can use commas to separate eader fields
+ * 	- you can use commas to separate header fields
  * 	- small cleanups
  * 30/11/10
  * 	- im_scale_dmask() normalises to 20, not 100 ... we hit the fast
  * 	  conv path more often
+ * 24/1/10
+ * 	- oops, missing braces in write dmask removed spaces between items
  */
 
 /*
@@ -128,7 +130,7 @@
  * written to the output image.
  *
  * @scale and @offset default to 1 and 0. Various functions, such as
- * im_conv(), will fail of @scale is zero.
+ * im_conv(), will fail if @scale is zero.
  *
  * You can read and write the matrix elements in @coeff.
  */
@@ -149,7 +151,7 @@
  * written to the output image.
  *
  * @scale and @offset default to 1.0 and 0.0. Various functions, such as
- * im_conv(), will fail of @scale is zero.
+ * im_conv(), will fail if @scale is zero.
  *
  * You can read and write the matrix elements in @coeff.
  */
@@ -264,7 +266,7 @@ im_create_imask( const char *filename, int xsize, int ysize )
  * @ysize: mask height
  * @Varargs: values to set for the mask
  *
- * Create an imask and initialise it from the funtion parameter list.
+ * Create an imask and initialise it from the function parameter list.
  *
  * See also: im_create_imask().
  *
@@ -347,7 +349,7 @@ im_create_dmask( const char *filename, int xsize, int ysize )
  * @ysize: mask height
  * @Varargs: values to set for the mask
  *
- * Create a dmask and initialise it from the funtion parameter list.
+ * Create a dmask and initialise it from the function parameter list.
  *
  * See also: im_create_dmask().
  *
@@ -925,9 +927,10 @@ im_write_dmask_name( DOUBLEMASK *in, const char *filename )
 	write_line( fp, "\n" );
 
 	for( i = 0, y = 0; y < in->ysize; y++ ) {
-		for( x = 0; x < in->xsize; x++, i++ ) 
+		for( x = 0; x < in->xsize; x++, i++ ) {
 			write_double( fp, in->coeff[i] );
 			write_line( fp, " " );
+		}
 
 		if( write_line( fp, "\n" ) ) {
 			fclose( fp );