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

bump min pygobject version

Browse Source 
apparently 3.12 is no longer enough :(

see

https://github.com/jcupitt/libvips/issues/199
This commit is contained in:
John Cupitt 2016-10-24 17:57:21 +01:00
parent ca7b51fb9e
commit ccee816bef
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -810,7 +810,7 @@ AC_ARG_ENABLE([pyvips8],
) )
if test "x$enable_pyvips8" = "xauto"; then if test "x$enable_pyvips8" = "xauto"; then
PKG_CHECK_EXISTS([pygobject-3.0 >= 3.12.0], PKG_CHECK_EXISTS([pygobject-3.0 >= 3.13.0],
[enable_pyvips8=yes [enable_pyvips8=yes
], ],
[AC_MSG_WARN([pygobject-3.0 not found; disabling vips8 python support]) [AC_MSG_WARN([pygobject-3.0 not found; disabling vips8 python support])
@ -828,7 +828,7 @@ if test x"$enable_pyvips8" = x"yes"; then
fi fi
if test x"$enable_pyvips8" = x"yes"; then if test x"$enable_pyvips8" = x"yes"; then
PKG_CHECK_MODULES(PYGOBJECT, [pygobject-3.0 >= 3.12.0]) PKG_CHECK_MODULES(PYGOBJECT, [pygobject-3.0 >= 3.13.0])
fi fi
AM_CONDITIONAL(ENABLE_PYVIPS8, test x"$enable_pyvips8" = x"yes") AM_CONDITIONAL(ENABLE_PYVIPS8, test x"$enable_pyvips8" = x"yes")
@ -1064,7 +1064,7 @@ build docs with gtkdoc: $enable_gtk_doc
gobject introspection: $found_introspection gobject introspection: $found_introspection
build vips7 Python binding: $with_python build vips7 Python binding: $with_python
install vips8 Python overrides: $enable_pyvips8 install vips8 Python overrides: $enable_pyvips8
(requires pygobject-3.12.0 or later) (requires pygobject-3.13.0 or later)
build radiance support: $with_radiance build radiance support: $with_radiance
build analyze support: $with_analyze build analyze support: $with_analyze
build PPM support: $with_ppm build PPM support: $with_ppm

4
libvips/conversion/bandjoin.c
View File

@ -142,7 +142,9 @@ vips_bandjoin_build( VipsObject *object )
bandary->out_bands = 0; bandary->out_bands = 0;
for( i = 0; i < bandary->n; i++ ) for( i = 0; i < bandary->n; i++ )
bandary->out_bands += bandary->in[i]->Bands; if( bandary->in[i] )
bandary->out_bands +=
bandary->in[i]->Bands;
} }
} }