Merge remote-tracking branch 'origin/master' into rot45

This commit is contained in:
John Cupitt 2013-10-25 12:58:17 +01:00
commit dec76f566d
2 changed files with 6 additions and 1 deletions

View File

@ -11,6 +11,8 @@
18/10/13 started 7.36.3
- fix compiler warnings in ubuntu 13.10
- reverse similarity rotation direction to match the convention used
elsewhere in vips
10/10/13 started 7.36.2
- better jpeg startup

View File

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