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

check .v enums more carefully

This commit is contained in:
John Cupitt 2021-08-30 14:02:03 +01:00
parent 6444bfb5bb
commit b62287a792
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,7 +1,7 @@
16/8/21 started 8.11.4
- fix off-by-one error in new rank fast path
- add "unlimited" flag to png load [joshuamsager]
- improve filtering of Coding [lovell]
- improve filtering of .v enums [lovell]
14/7/21 started 8.11.3
- build threadpool later [kleisauke]

19
libvips/iofuncs/vips.c
View File

@ -332,6 +332,7 @@ vips__read_header_bytes( VipsImage *im, unsigned char *from )
{
gboolean swap;
int i;
GEnumValue *value;
#ifdef SHOW_HEADER
printf( "vips__read_header_bytes: file bytes:\n" );
@ -383,14 +384,16 @@ vips__read_header_bytes( VipsImage *im, unsigned char *from )
/* Coding and Type have missing values, so we look up in the enum.
*/
im->Type = g_enum_get_value(
g_type_class_ref( VIPS_TYPE_INTERPRETATION ),
im->Type ) ?
im->Type : VIPS_INTERPRETATION_ERROR;
im->Coding = g_enum_get_value(
g_type_class_ref( VIPS_TYPE_CODING ),
im->Coding ) ?
im->Coding : VIPS_CODING_ERROR;
value = g_enum_get_value( g_type_class_ref( VIPS_TYPE_INTERPRETATION ),
im->Type );
if( !value ||
strcmp( value->value_nick, "last" ) == 0 )
im->Type = VIPS_INTERPRETATION_ERROR;
value = g_enum_get_value( g_type_class_ref( VIPS_TYPE_CODING ),
im->Coding );
if( !value ||
strcmp( value->value_nick, "last" ) == 0 )
im->Coding = VIPS_CODING_ERROR;
/* Offset, Res, etc. don't affect vips file layout, just
* pixel interpretation, don't clip them.