From b210d34192cc8dd38f0a97d1a308aeef8c18da20 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 14 Jan 2012 11:19:50 +0000
Subject: [PATCH] interpolation CLI args were broken

thanks to speckins, broken since 7.26.4, embarassingly

I've added another test to make check to stop this happening again
---
 ChangeLog                           | 3 +++
 configure.in                        | 4 ++--
 libvips/deprecated/dispatch_types.c | 8 +++++---
 po/vips7.pot                        | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 124704ff..d2b6b410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+14/1/12 started 7.26.8
+- interpolate CLI args were broken (thanks speckins)
+
 5/12/11 started 7.26.7
 - lazy read from tiled tiff from layers other than 0 was broken
 - optional args to vips_call*() do not work, disabled (fixed correctly in
diff --git a/configure.in b/configure.in
index 757d841e..b3c4d2fb 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR(m4)
 # user-visible library versioning
 m4_define([vips_major_version], [7])
 m4_define([vips_minor_version], [26])
-m4_define([vips_micro_version], [7])
+m4_define([vips_micro_version], [8])
 m4_define([vips_version],
           [vips_major_version.vips_minor_version.vips_micro_version])
 
@@ -29,7 +29,7 @@ PACKAGE=vips
 #   interface changes not backwards compatible?: reset age to 0
 
 LIBRARY_CURRENT=30
-LIBRARY_REVISION=6
+LIBRARY_REVISION=7
 LIBRARY_AGE=15
 
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
diff --git a/libvips/deprecated/dispatch_types.c b/libvips/deprecated/dispatch_types.c
index d00faac6..fb314a2e 100644
--- a/libvips/deprecated/dispatch_types.c
+++ b/libvips/deprecated/dispatch_types.c
@@ -886,11 +886,13 @@ im_type_desc im__output_gvalue = {
 static int
 input_interpolate_init( im_object *obj, char *str )
 {
-	VipsObjectClass *interpolate_class;
+	GType type = g_type_from_name( "VipsInterpolate" );
+	VipsObjectClass *class = VIPS_OBJECT_CLASS( g_type_class_ref( type ) );
 	VipsObject *object;
 
-	interpolate_class = vips_class_find( "VipsInterpolate", "interpolate" );
-	if( !(object = vips_object_new_from_string( interpolate_class, str )) )
+	g_assert( class );
+
+	if( !(object = vips_object_new_from_string( class, str )) )
 		return( -1 );
 	*obj = object;
 
diff --git a/po/vips7.pot b/po/vips7.pot
index f168ea66..39fb3502 100644
--- a/po/vips7.pot
+++ b/po/vips7.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-08 21:50+0000\n"
+"POT-Creation-Date: 2012-01-14 11:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"