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

fix with orc-0.4.11

Browse Source
This commit is contained in:
John Cupitt 2015-12-08 15:33:57 +00:00
parent 06a627fc51
commit a57cccbf0f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -497,7 +497,14 @@ if test x"$with_orc" != "xno"; then
PKG_CHECK_MODULES(ORC, orc-0.4 >= 0.4.11, PKG_CHECK_MODULES(ORC, orc-0.4 >= 0.4.11,
[AC_DEFINE(HAVE_ORC,1,[define if you have orc-0.4.11 or later installed.]) [AC_DEFINE(HAVE_ORC,1,[define if you have orc-0.4.11 or later installed.])
with_orc=yes with_orc=yes
PACKAGES_USED="$PACKAGES_USED orc-0.4"], PACKAGES_USED="$PACKAGES_USED orc-0.4"
save_LIBS=$LIBS
LIBS="$LIBS $ORC_LIBS"
AC_CHECK_FUNCS(orc_program_get_error,
AC_DEFINE(HAVE_ORC_PROGRAM_GET_ERROR,1,
[define if your orc has orc_program_get_error.]))
LIBS=$save_LIBS
],
[AC_MSG_WARN([orc-0.4.11 or later not found; disabling orc support]) [AC_MSG_WARN([orc-0.4.11 or later not found; disabling orc support])
with_orc=no with_orc=no
]) ])

2
libvips/iofuncs/vector.c
View File

@ -71,9 +71,11 @@ gboolean vips__vector_enabled = TRUE;
void void
vips_vector_error( VipsVector *vector ) vips_vector_error( VipsVector *vector )
{ {
#ifdef HAVE_ORC_PROGRAM_GET_ERROR
if( vector->program ) if( vector->program )
vips_warn( "VipsVector", "orc error: %s", vips_warn( "VipsVector", "orc error: %s",
orc_program_get_error( vector->program ) ); orc_program_get_error( vector->program ) );
#endif /*HAVE_ORC_PROGRAM_GET_ERROR*/
} }
void void