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

Merge branch '8.6' into add-canny

Browse Source
This commit is contained in:
John Cupitt 2018-03-04 18:45:59 +00:00
commit 7f5b0b94c3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -11,6 +11,8 @@
- use pkg-config to find libjpeg, if we can - use pkg-config to find libjpeg, if we can
- better clean of output image in vips_image_write() fixes a crash - better clean of output image in vips_image_write() fixes a crash
writing twice to memory writing twice to memory
- better rounding behaviour in convolution means we hit the vector path more
often
5/1/18 started 8.6.2 5/1/18 started 8.6.2
- vips_sink_screen() keeps a ref to the input image ... stops a rare race - vips_sink_screen() keeps a ref to the input image ... stops a rare race

6
libvips/convolution/convi.c
View File

@ -904,8 +904,12 @@ vips_convi_intize( VipsConvi *convi, VipsImage *M )
/* The mask max rounded up to the next power of two gives the exponent /* The mask max rounded up to the next power of two gives the exponent
* all elements share. Values are eg. -3 for 1/8, 3 for 8. * all elements share. Values are eg. -3 for 1/8, 3 for 8.
*
* Add one so we round up stuff exactly on x.0. We multiply by 128
* later, so 1.0 (for example) would become 128, which is outside
* signed 8 bit.
*/ */
shift = ceil( log2( mx ) ); shift = ceil( log2( mx + 1 ) );
/* We need to sum n_points, so we have to shift right before adding a /* We need to sum n_points, so we have to shift right before adding a
* new value to make sure we have enough range. * new value to make sure we have enough range.