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

Merge remote-tracking branch 'origin/7.30' into 7.30

This commit is contained in:
John Cupitt 2012-12-31 14:25:14 +00:00
parent ee2b1f71ce f83854b049
commit 1e39eb6c75
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.in
View File

@ -268,11 +268,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
ALL_LINGUAS="en_GB de"
AM_GLIB_GNU_GETTEXT
# C++ fails to compile mysteriously without gettext ... fail here
if test x"$gt_cv_have_gettext" != x"yes"; then
AC_MSG_ERROR([gettext not found])
fi
# Checks for libraries.
# build list of pkg-config packages we used here

2
libvips/arithmetic/measure.c
View File

@ -162,7 +162,7 @@ vips_measure_build( VipsObject *object )
vips_warn( "VipsMeasure",
_( "patch %d x %d, band %d: "
"avg = %g, sdev = %g" ),
i, j, avg, dev );
i, j, b, avg, dev );
*ARY( measure->out, b, i + j * measure->h ) =
avg;