"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tools/vips.c" between
vips-8.10.6.tar.gz and vips-8.11.0.tar.gz

About: VIPS is a free image processing system (see also the GUI nip2).

vips.c  (vips-8.10.6):vips.c  (vips-8.11.0)
skipping to change at line 104 skipping to change at line 104
#include <ctype.h> #include <ctype.h>
#include <locale.h> #include <locale.h>
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#if ENABLE_DEPRECATED #if ENABLE_DEPRECATED
#include <vips/vips7compat.h> #include <vips/vips7compat.h>
#endif #endif
#ifdef OS_WIN32 #ifdef G_OS_WIN32
#define strcasecmp(a,b) _stricmp(a,b) #define strcasecmp(a,b) _stricmp(a,b)
#endif #endif /*G_OS_WIN32*/
static char *main_option_plugin = NULL; static char *main_option_plugin = NULL;
static gboolean main_option_version; static gboolean main_option_version;
static void * static void *
list_class( GType type, void *user_data ) list_class( GType type, void *user_data )
{ {
VipsObjectClass *class = VIPS_OBJECT_CLASS( g_type_class_ref( type ) ); VipsObjectClass *class = VIPS_OBJECT_CLASS( g_type_class_ref( type ) );
int depth = vips_type_depth( type ); int depth = vips_type_depth( type );
skipping to change at line 461 skipping to change at line 461
#ifdef DEBUG #ifdef DEBUG
printf( "parse_options:\n" ); printf( "parse_options:\n" );
for( i = 0; i < *argc; i++ ) for( i = 0; i < *argc; i++ )
printf( "%d) %s\n", i, argv[i] ); printf( "%d) %s\n", i, argv[i] );
#endif /*DEBUG*/ #endif /*DEBUG*/
vips_buf_appendf( &buf, "%7s - %s\n", vips_buf_appendf( &buf, "%7s - %s\n",
"OPER", _( "execute vips operation OPER" ) ); "OPER", _( "execute vips operation OPER" ) );
g_option_context_set_summary( context, vips_buf_all( &buf ) ); g_option_context_set_summary( context, vips_buf_all( &buf ) );
#ifdef HAVE_G_WIN32_GET_COMMAND_LINE #ifdef G_OS_WIN32
if( !g_option_context_parse_strv( context, &argv, &error ) ) if( !g_option_context_parse_strv( context, &argv, &error ) )
#else /*!HAVE_G_WIN32_GET_COMMAND_LINE*/ #else /*!G_OS_WIN32*/
if( !g_option_context_parse( context, argc, &argv, &error ) ) if( !g_option_context_parse( context, argc, &argv, &error ) )
#endif /*HAVE_G_WIN32_GET_COMMAND_LINE*/ #endif /*G_OS_WIN32*/
{ {
if( error ) { if( error ) {
fprintf( stderr, "%s\n", error->message ); fprintf( stderr, "%s\n", error->message );
g_error_free( error ); g_error_free( error );
} }
vips_error_exit( NULL ); vips_error_exit( NULL );
} }
/* On Windows, argc will not have been updated by /* On Windows, argc will not have been updated by
skipping to change at line 534 skipping to change at line 534
GError *error = NULL; GError *error = NULL;
if( VIPS_INIT( argv[0] ) ) if( VIPS_INIT( argv[0] ) )
vips_error_exit( NULL ); vips_error_exit( NULL );
textdomain( GETTEXT_PACKAGE ); textdomain( GETTEXT_PACKAGE );
setlocale( LC_ALL, "" ); setlocale( LC_ALL, "" );
/* On Windows, argv is ascii-only .. use this to get a utf-8 version of /* On Windows, argv is ascii-only .. use this to get a utf-8 version of
* the args. * the args.
*/ */
#ifdef HAVE_G_WIN32_GET_COMMAND_LINE #ifdef G_OS_WIN32
argv = g_win32_get_command_line(); argv = g_win32_get_command_line();
#endif /*HAVE_G_WIN32_GET_COMMAND_LINE*/ #endif /*G_OS_WIN32*/
#ifdef DEBUG_FATAL #ifdef DEBUG_FATAL
/* Set masks for debugging ... stop on any problem. /* Set masks for debugging ... stop on any problem.
*/ */
g_log_set_always_fatal( g_log_set_always_fatal(
G_LOG_FLAG_RECURSION | G_LOG_FLAG_RECURSION |
G_LOG_FLAG_FATAL | G_LOG_FLAG_FATAL |
G_LOG_LEVEL_ERROR | G_LOG_LEVEL_ERROR |
G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_CRITICAL |
G_LOG_LEVEL_WARNING ); G_LOG_LEVEL_WARNING );
skipping to change at line 585 skipping to change at line 585
g_free( help ); g_free( help );
exit( 0 ); exit( 0 );
} }
/* Also disable help output: we want to be able to display full help /* Also disable help output: we want to be able to display full help
* in a second pass after all options have been created. * in a second pass after all options have been created.
*/ */
g_option_context_set_help_enabled( context, FALSE ); g_option_context_set_help_enabled( context, FALSE );
#ifdef HAVE_G_WIN32_GET_COMMAND_LINE #ifdef G_OS_WIN32
if( !g_option_context_parse_strv( context, &argv, &error ) ) if( !g_option_context_parse_strv( context, &argv, &error ) )
#else /*!HAVE_G_WIN32_GET_COMMAND_LINE*/ #else /*!G_OS_WIN32*/
if( !g_option_context_parse( context, &argc, &argv, &error ) ) if( !g_option_context_parse( context, &argc, &argv, &error ) )
#endif /*HAVE_G_WIN32_GET_COMMAND_LINE*/ #endif /*G_OS_WIN32*/
{ {
if( error ) { if( error ) {
fprintf( stderr, "%s\n", error->message ); fprintf( stderr, "%s\n", error->message );
g_error_free( error ); g_error_free( error );
} }
vips_error_exit( NULL ); vips_error_exit( NULL );
} }
/* On Windows, argc will not have been updated by /* On Windows, argc will not have been updated by
skipping to change at line 756 skipping to change at line 756
} }
/* Still not handled? We may not have called parse_options(), so /* Still not handled? We may not have called parse_options(), so
* --help args may not have been processed. * --help args may not have been processed.
*/ */
if( !handled ) if( !handled )
parse_options( context, &argc, argv ); parse_options( context, &argc, argv );
g_option_context_free( context ); g_option_context_free( context );
/* We don't free this on error exit, sadly. #ifdef G_OS_WIN32
*/
#ifdef HAVE_G_WIN32_GET_COMMAND_LINE
g_strfreev( argv ); g_strfreev( argv );
#endif /*HAVE_G_WIN32_GET_COMMAND_LINE*/ #endif /*G_OS_WIN32*/
vips_shutdown(); vips_shutdown();
return( 0 ); return( 0 );
} }
 End of changes. 12 change blocks. 
14 lines changed or deleted 12 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)