sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/7.40'

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
John Cupitt 2014-08-17 10:00:03 +01:00
commit 2e2809a6b4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

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

4
libvips/resample/similarity.c
View File

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