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

update for new g_value_get_schar() function

Browse Source
This commit is contained in:
John Cupitt 2012-10-23 14:36:42 +01:00
parent c6478c811b
commit f59b0f88f0
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -324,6 +324,7 @@ PKG_CHECK_MODULES(THREADS, glib-2.0 >= 2.32,[
AC_DEFINE(HAVE_COND_INIT,1,[define if your glib has g_cond_init().]) AC_DEFINE(HAVE_COND_INIT,1,[define if your glib has g_cond_init().])
AC_DEFINE(HAVE_THREAD_NEW,1,[define if your glib has g_thread_new().]) AC_DEFINE(HAVE_THREAD_NEW,1,[define if your glib has g_thread_new().])
AC_DEFINE(HAVE_PRIVATE_INIT,1,[define if your glib has G_PRIVATE_INIT().]) AC_DEFINE(HAVE_PRIVATE_INIT,1,[define if your glib has G_PRIVATE_INIT().])
AC_DEFINE(HAVE_VALUE_GET_SCHAR,1,[define if your glib has g_value_get_schar().])
]) ])
# check for gtk-doc # check for gtk-doc

14
libvips/iofuncs/cache.c
View File

@ -112,6 +112,14 @@ static GMutex *vips_cache_lock = NULL;
#define INT64_HASH(X) (g_direct_hash(X)) #define INT64_HASH(X) (g_direct_hash(X))
#define DOUBLE_HASH(X) (g_direct_hash(X)) #define DOUBLE_HASH(X) (g_direct_hash(X))
/* Old glibs use g_value_get_char(), new ones g_value_get_schar().
*/
#ifdef HAVE_VALUE_GET_SCHAR
#define VIPS_VALUE_GET_CHAR g_value_get_schar
#else
#define VIPS_VALUE_GET_CHAR g_value_get_char
#endif
/* Pass in the pspec so we can get the generic type. For example, a /* Pass in the pspec so we can get the generic type. For example, a
* held in a GParamSpec allowing OBJECT, but the value could be of type * held in a GParamSpec allowing OBJECT, but the value could be of type
* VipsImage. generics are much faster to compare. * VipsImage. generics are much faster to compare.
@ -128,7 +136,7 @@ vips_value_hash( GParamSpec *pspec, GValue *value )
if( generic == G_TYPE_PARAM_BOOLEAN ) if( generic == G_TYPE_PARAM_BOOLEAN )
return( (unsigned int) g_value_get_boolean( value ) ); return( (unsigned int) g_value_get_boolean( value ) );
else if( generic == G_TYPE_PARAM_CHAR ) else if( generic == G_TYPE_PARAM_CHAR )
return( (unsigned int) g_value_get_char( value ) ); return( (unsigned int) VIPS_VALUE_GET_CHAR( value ) );
else if( generic == G_TYPE_PARAM_UCHAR ) else if( generic == G_TYPE_PARAM_UCHAR )
return( (unsigned int) g_value_get_uchar( value ) ); return( (unsigned int) g_value_get_uchar( value ) );
else if( generic == G_TYPE_PARAM_INT ) else if( generic == G_TYPE_PARAM_INT )
@ -230,8 +238,8 @@ vips_value_equal( GParamSpec *pspec, GValue *v1, GValue *v2 )
return( g_value_get_boolean( v1 ) == return( g_value_get_boolean( v1 ) ==
g_value_get_boolean( v2 ) ); g_value_get_boolean( v2 ) );
else if( generic == G_TYPE_PARAM_CHAR ) else if( generic == G_TYPE_PARAM_CHAR )
return( g_value_get_char( v1 ) == return( VIPS_VALUE_GET_CHAR( v1 ) ==
g_value_get_char( v2 ) ); VIPS_VALUE_GET_CHAR( v2 ) );
if( generic == G_TYPE_PARAM_UCHAR ) if( generic == G_TYPE_PARAM_UCHAR )
return( g_value_get_uchar( v1 ) == return( g_value_get_uchar( v1 ) ==
g_value_get_uchar( v2 ) ); g_value_get_uchar( v2 ) );