Merge remote-tracking branch 'origin/7.40'

Conflicts:
	ChangeLog

ChangeLog

@@ -3,8 +3,9 @@
 - fix pngload with libpng >1.6.1
 - add vips_resize()
 
-12/8/14 started 7.40.5
+12/8/14 started 7.40.6
 - more doc fixes
+- fix similarity rotate+scale, thanks Topochicho
 
 25/7/14 started 7.40.5
 - fix a race in im_maxpos_avg()

libvips/resample/similarity.c

@@ -6,6 +6,8 @@
  * 25/10/13
  * 	- oops, reverse rotation direction to match the convention used in the
  * 	  rest of vips
+ * 13/8/14
+ * 	- oops, missing scale from b, thanks Topochicho
  */
 
 /*
@@ -82,7 +84,7 @@ vips_similarity_build( VipsObject *object )
 		return( -1 );
 
 	a = similarity->scale * cos( VIPS_RAD( similarity->angle ) ); 
-	b = -sin( VIPS_RAD( similarity->angle ) );
+	b = similarity->scale * -sin( VIPS_RAD( similarity->angle ) );
 	c = -b;
 	d = a;