From cbce10db8147e25589ef9f6879df11f0fcc214bd Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 12 Aug 2016 10:39:03 +0100
Subject: [PATCH] allow missing offset in matrix header

defaults to zero
---
 TODO                  |  9 ++-------
 libvips/foreign/csv.c | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/TODO b/TODO
index fc425b5f..fbc85776 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,7 @@
-- try this blur.mat
-
-	6 1 3896 
-	20 22 24 27 30 32
- 
-  ie. missing offset, though scale is there ... is not recognised
-
 - redo conva ... make a cumulative image and sub distances in that
 
+- add APPROX precision to convsep test
+
 - add more webp tests to py suite
 
 - try moving some more of the CLI tests to py
diff --git a/libvips/foreign/csv.c b/libvips/foreign/csv.c
index 2e35cf16..f72d76f1 100644
--- a/libvips/foreign/csv.c
+++ b/libvips/foreign/csv.c
@@ -30,6 +30,8 @@
  * 4/6/15
  * 	- try to support DOS files under linux ... we have to look for \r\n
  * 	  linebreaks
+ * 12/8/16
+ * 	- allow missing offset in matrix header
  */
 
 /*
@@ -522,6 +524,8 @@ read_ascii_double( FILE *fp, const char whitemap[256], double *out )
 
 /* Read the header. Two numbers for width and height, and two optional
  * numbers for scale and offset. 
+ *
+ * We can have scale and no offset, in which case we assume offset = 0.
  */
 static int
 vips__matrix_header( char *whitemap, FILE *fp,
@@ -532,6 +536,11 @@ vips__matrix_header( char *whitemap, FILE *fp,
 	int i;
 	int ch;
 
+	/* Offset defaults to zero.
+	 */
+	header[2] = 1.0;
+	header[3] = 0.0;
+
 	for( i = 0; i < 4 && 
 		(ch = read_ascii_double( fp, whitemap, &header[i] )) == 0; 
 		i++ )
@@ -556,22 +565,17 @@ vips__matrix_header( char *whitemap, FILE *fp,
 			"%s", _( "width / height out of range" ) );
 		return( -1 );
 	}
-	if( i == 3 ) { 
-		vips_error( "mask2vips", "%s", _( "bad scale / offset" ) );
-		return( -1 );
-	}
 	if( (ch = read_ascii_double( fp, whitemap, &d )) != '\n' ) {
 		vips_error( "mask2vips", "%s", _( "extra chars in header" ) );
 		return( -1 );
 	}
-	if( i > 2 && 
-		header[2] == 0.0 ) {
+	if( header[2] == 0.0 ) {
 		vips_error( "mask2vips", "%s", _( "zero scale" ) );
 		return( -1 );
 	}
 
-	*scale = i > 2 ?  header[2] : 1.0;
-	*offset = i > 2 ?  header[3] : 0.0;
+	*scale = header[2];
+	*offset = header[3];
 
 	skip_line( fp );