Merge remote-tracking branch 'origin/master'

TODO

@@ -27,6 +27,19 @@
 
 
 
+
+
+- nicolas's convsep patch
+
+- add nifti support
+
+	http://niftilib.sourceforge.net/
+
+
+
+
+
+
 - do clip/embed etc. in new style, good to get everything that VipsAdd uses in
   the new stack
 

libvips/convolution/im_aconv.c

@@ -72,9 +72,9 @@ $ vips im_max abs.v
  */
 
 /*
- */
 #define DEBUG
 #define VIPS_DEBUG
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

libvips/format/im_csv2vips.c

@@ -50,7 +50,6 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>