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

Merge branch '8.12'

Browse Source
This commit is contained in:
John Cupitt 2021-12-22 10:26:57 +00:00
commit eb906f182d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@
- fix a crash with 0 length vectors - fix a crash with 0 length vectors
- change default frame delay for GIFs from 1s to 0.1s - change default frame delay for GIFs from 1s to 0.1s
- remove stray trailing comma from iiif3 dirnames [whalehub] - remove stray trailing comma from iiif3 dirnames [whalehub]
- fix TTF load [chregu]
21/11/21 started 8.12.1 21/11/21 started 8.12.1
- fix insert [chregu] - fix insert [chregu]

8
libvips/foreign/magick.c
View File

@ -82,6 +82,14 @@ magick_sniff( const unsigned char *bytes, size_t length )
bytes[3] == 0 ) bytes[3] == 0 )
return( "ICO" ); return( "ICO" );
if( length >= 5 &&
bytes[0] == 0 &&
bytes[1] == 1 &&
bytes[2] == 0 &&
bytes[3] == 0 &&
bytes[4] == 0 )
return( "TTF" );
if( length >= 18 && if( length >= 18 &&
(bytes[1] == 0 || (bytes[1] == 0 ||
bytes[1] == 1) && bytes[1] == 1) &&