From 0faf5395b287971fc70beee32e03939a998da0ea Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 3 Jun 2016 16:24:21 +0100 Subject: [PATCH] conversion to grey16 could lock a typo could cause infinite recursion during conversion --- ChangeLog | 1 + libvips/colour/colourspace.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc15f994..3209c7d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ - autorotate option for tiff load - tiffsave converts for jpg if jpg compression is turned on - tiffsave supports --strip +- conversions to GREY16 could lock 18/5/16 started 8.3.2 - more robust vips image reading diff --git a/libvips/colour/colourspace.c b/libvips/colour/colourspace.c index 1221c3c2..d7a90967 100644 --- a/libvips/colour/colourspace.c +++ b/libvips/colour/colourspace.c @@ -79,7 +79,7 @@ vips_scRGB2RGB16( VipsImage *in, VipsImage **out, ... ) static int 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