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

Merge branch '7.40'

This commit is contained in:
John Cupitt 2014-11-11 20:43:19 +00:00
parent 326854843a 8a44d6f7b3
commit f16e252b3e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -28,6 +28,7 @@
27/10/14 started 7.40.12
- better tiff detection (Lovell)
- fix memleak in sharpen (Lovell)
8/10/14 started 7.40.11
- rework extra band handling for colour functions

2
libvips/convolution/sharpen.c
View File

@ -251,7 +251,7 @@ vips_sharpen_build( VipsObject *object )
sharpen->ix2 = ix2 = sharpen->x2 * 327.67;
sharpen->ix3 = ix3 = sharpen->x3 * 327.67;
if( !(sharpen->lut = VIPS_ARRAY( sharpen->out, ix2 + ix3 + 1, int )) )
if( !(sharpen->lut = VIPS_ARRAY( object, ix2 + ix3 + 1, int )) )
return( -1 );
for( i = 0; i < ix1; i++ ) {