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

add geo strings

This commit is contained in:
John Cupitt 2017-01-05 15:02:29 +00:00
parent 366c1acd6c
commit e958de7814
1 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tools/vipsthumbnail.c
View File

@ -251,6 +251,44 @@ thumbnail_process( VipsObject *process, const char *filename )
return( 0 );
}
/* Parse a geometry string and set thumbnail_width and thumbnail_height.
*/
static int
thumbnail_parse_geometry( const char *geometry )
{
GRegEx *regex;
regex = g_regex_new( "^(\d+)? (x)? (\d+)? ([<>])?$",
G_REGEX_CASELESS | G_REGEX_EXTENDED, 0, NULL );
g_regex_match( regex, geometry, 0, &match_info );
if(
char *p;
/* Up to 'x'
int w, h;
gboolean handled;
handled = FALSE;
if( sscanf( geometry, "%d x %d <", &w, &h ) == 2 ) {
thumbnail_width = w;
thumbnail_height = h;
crop_image = FALSE;
}
if( sscanf( geometry, "%d x %d >", &w, &h ) == 2 ) {
thumbnail_width = w;
thumbnail_height = h;
crop_image = TRUE;
}
}
int
main( int argc, char **argv )
{
@ -296,14 +334,32 @@ main( int argc, char **argv )
g_option_context_free( context );
/*
if( sscanf( thumbnail_size, "%d x %d",
&thumbnail_width, &thumbnail_height ) != 2 ) {
&thumbnail_width, &thumbnail_height ) == 2 ) {
if( sscanf( thumbnail_size, "%d", &thumbnail_width ) != 1 )
vips_error_exit( "unable to parse size \"%s\" -- "
"use eg. 128 or 200x300", thumbnail_size );
thumbnail_height = thumbnail_width;
}
*/
if( sscanf( thumbnail_size, "%d x %d",
&thumbnail_width, &thumbnail_height ) == 2 ) {
if( sscanf( thumbnail_size, "%d", &thumbnail_width ) != 1 )
vips_error_exit( "unable to parse size \"%s\" -- "
"use eg. 128 or 200x300", thumbnail_size );
thumbnail_height = thumbnail_width;
}
if( sscanf( thumbnail_size, "%d", &thumbnail_width ) != 1 )
thumbnail_height = thumbnail_width;
}
vips_error_exit( "unable to parse size \"%s\" -- "
"use eg. 128 or 200x300", thumbnail_size );
if( rotate_image ) {
#ifndef HAVE_EXIF