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

Merge branch '8.2'

Browse Source
This commit is contained in:
John Cupitt 2016-02-26 12:44:54 +00:00
commit 609e639528
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 @@
27/1/16 started 8.2.3 27/1/16 started 8.2.3
- fix a crash with SPARC byte-order labq vips images - fix a crash with SPARC byte-order labq vips images
- fix parsing of filenames containing brackets, thanks shilpi230
12/1/16 started 8.2.2 12/1/16 started 8.2.2
- changes to ease compiling C++ binding with MSVC [Lovell Fuller] - changes to ease compiling C++ binding with MSVC [Lovell Fuller]

2
libvips/iofuncs/util.c
View File

@ -1231,7 +1231,7 @@ vips__token_get( const char *p, VipsToken *token, char *string, int size )
* so the next break must be bracket, equals, comma. * so the next break must be bracket, equals, comma.
*/ */
*token = VIPS_TOKEN_STRING; *token = VIPS_TOKEN_STRING;
n = strcspn( p, "<[{()}]>=," ); n = strcspn( p, "[]=," );
i = VIPS_MIN( n, size ); i = VIPS_MIN( n, size );
vips_strncpy( string, p, i + 1 ); vips_strncpy( string, p, i + 1 );
p += n; p += n;