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

conversion to grey16 could lock

Browse Source 
a typo could cause infinite recursion during conversion
This commit is contained in:
John Cupitt 2016-06-03 16:24:21 +01:00
parent c5a4afbe40
commit 0faf5395b2
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

@ -13,6 +13,7 @@
- autorotate option for tiff load - autorotate option for tiff load
- tiffsave converts for jpg if jpg compression is turned on - tiffsave converts for jpg if jpg compression is turned on
- tiffsave supports --strip - tiffsave supports --strip
- conversions to GREY16 could lock
18/5/16 started 8.3.2 18/5/16 started 8.3.2
- more robust vips image reading - more robust vips image reading

2
libvips/colour/colourspace.c
View File

@ -79,7 +79,7 @@ vips_scRGB2RGB16( VipsImage *in, VipsImage **out, ... )
static int static int
vips_scRGB2BW16( VipsImage *in, VipsImage **out, ... ) vips_scRGB2BW16( VipsImage *in, VipsImage **out, ... )
{ {
return( vips_scRGB2BW16( in, out, "depth", 16, NULL ) ); return( vips_scRGB2BW( in, out, "depth", 16, NULL ) );
} }
/* Do these two with a simple cast ... since we're just cast shifting, we can /* Do these two with a simple cast ... since we're just cast shifting, we can