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

Merge branch 'master' into add-canny

Browse Source
This commit is contained in:
John Cupitt 2018-03-04 15:31:19 +00:00
commit bca2418d9a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -9,6 +9,8 @@
12/2/18 started 8.6.3 12/2/18 started 8.6.3
- 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
writing twice to memory
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

2
libvips/iofuncs/image.c
View File

@ -2547,7 +2547,7 @@ vips_image_write( VipsImage *image, VipsImage *out )
vips_object_local( out, image ); vips_object_local( out, image );
} }
else { else {
vips__reorder_clear( image ); vips__reorder_clear( out );
vips__link_break_all( out ); vips__link_break_all( out );
g_object_unref( image ); g_object_unref( image );
} }