Merge branch 'master' of github.com:jcupitt/libvips

.travis.yml

@@ -1,7 +1,7 @@
 language: cpp
 
 before_script:
-  - ./bootstrap.sh
+  - ./autogen.sh
   - ./configure
     --disable-dependency-tracking
     --with-jpeg-includes=$JPEG/include

ChangeLog

@@ -36,6 +36,7 @@
 - gif loader can write 1, 2, 3, or 4 bands depending on file contents
 - support --strip for pngsave
 - add svgz support [Felix Bünemann]
+- rename boostrap.sh -> autogen to help snapcraft
 
 30/7/16 started 8.3.3
 - fix performance regression in 8.3.2, thanks Lovell

README.md

@@ -80,7 +80,7 @@ and `gobject-introspection`, see the dependencies section below. For example:
 
 Then build the build system with:
 
-	$ ./bootstrap.sh
+	$ ./autogen.sh
 
 Debug build:
 

cplusplus/VImage.cpp

@@ -571,7 +571,7 @@ VImage::new_from_image( std::vector<double> pixel )
 	VImage onepx = VImage::black( 1, 1, 
 		VImage::option()->set( "bands", bands() ) ); 
 
-	onepx = onepx.linear( to_vectorv( 1, 1.0 ), pixel ).cast( format() );
+	onepx = (onepx + pixel).cast( format() );
 
 	VImage big = onepx.embed( 0, 0, width(), height(), 
 		VImage::option()->set( "extend", VIPS_EXTEND_COPY ) );