Merge remote-tracking branch 'origin/7.28'

2012-07-01 11:08:02 +01:00 · 2012-07-01 11:08:02 +01:00 · a94ce8957e
commit a94ce8957e
parent bb33eb82c9 ec53b1af74
3 changed files with 2 additions and 2 deletions
--- a/1
+++ b/1
@ -12,6 +12,7 @@

 18/6/12 started 7.28.9
 - slightly more memory debugging output
+- remove references to the static bicubic interpolator from the docs

 18/6/12 started 7.28.8
 - fixes for centos5 portability
--- a/doc/src/interpolate.tex
+++ b/doc/src/interpolate.tex
@ -139,7 +139,6 @@ interpolators:
 \begin{verbatim}
 VipsInterpolate *vips_interpolate_nearest_static( void );
 VipsInterpolate *vips_interpolate_bilinear_static( void );
-VipsInterpolate *vips_interpolate_bicubic_static( void );
 \end{verbatim}

 \noindent
--- a/libvips/resample/interpolate.c
+++ b/libvips/resample/interpolate.c
@ -59,7 +59,7 @@

 /**
 * SECTION: interpolate
- * @short_description: various interpolators: nearest, bilinear, bicubic, and
+ * @short_description: various interpolators: nearest, bilinear, and
 * some non-linear
 * @stability: Stable
 * @include: vips/vips.h