From a5574dc0ce52051271f9b2aad6f7c2150cc9d186 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 30 Nov 2009 17:14:59 +0000
Subject: [PATCH] oops, UCS2xx was broken

---
 ChangeLog                              |  4 ++++
 configure.in                           | 10 +++++-----
 libvips/colour/im_UCS2LCh.c            |  4 ++++
 tools/scripts/Makefile.am              |  4 ++--
 tools/scripts/{vips-7.20 => vips-7.21} |  0
 vips-7.20.pc.in => vips-7.21.pc.in     |  0
 vipsCC-7.20.pc.in => vipsCC-7.21.pc.in |  0
 7 files changed, 15 insertions(+), 7 deletions(-)
 rename tools/scripts/{vips-7.20 => vips-7.21} (100%)
 rename vips-7.20.pc.in => vips-7.21.pc.in (100%)
 rename vipsCC-7.20.pc.in => vipsCC-7.21.pc.in (100%)

diff --git a/ChangeLog b/ChangeLog
index 8010bb02..061e2663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+26/11/09 started 7.21.0
+- branch for new dev cycle
+- argh, missing init from colour.c (thanks Peter)
+
 26/11/09 started 7.20.3
 - updated en_GB.po translation 
 - file_length is gint64 to avoid win32 breakage
diff --git a/configure.in b/configure.in
index ab963985..f1ca07af 100644
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,8 @@ AC_CONFIG_MACRO_DIR(m4)
 
 # user-visible library versioning
 IM_MAJOR_VERSION=7
-IM_MINOR_VERSION=20
-IM_MICRO_VERSION=3
+IM_MINOR_VERSION=21
+IM_MICRO_VERSION=0
 IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION
 IM_VERSION_STRING=$IM_VERSION-`date`
 
@@ -23,7 +23,7 @@ PACKAGE=vips
 #   interface changes not backwards compatible?: reset age to 0
 
 LIBRARY_CURRENT=28
-LIBRARY_REVISION=1
+LIBRARY_REVISION=2
 LIBRARY_AGE=13
 
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
@@ -494,8 +494,8 @@ AC_SUBST(PACKAGES_USED)
 #	vips-$IM_MAJOR_VERSION.$IM_MINOR_VERSION.pc
 # in AC_OUTPUT, but that seems to break for some combinations of sh/m4
 AC_OUTPUT([
-	vips-7.20.pc
-	vipsCC-7.20.pc
+	vips-7.21.pc
+	vipsCC-7.21.pc
 	Makefile 
 	libvips/include/vips/version.h 
 	libvips/include/Makefile 
diff --git a/libvips/colour/im_UCS2LCh.c b/libvips/colour/im_UCS2LCh.c
index 25c9effa..264dcab4 100644
--- a/libvips/colour/im_UCS2LCh.c
+++ b/libvips/colour/im_UCS2LCh.c
@@ -7,6 +7,8 @@
  *	- uses im_wrap_oneonebuf() now
  * 2/11/09
  * 	- gtkdoc
+ * 30/11/09
+ * 	- argh, im_col_make_tables_UCS(); missing, thanks Peter
  */
 
 /*
@@ -89,6 +91,8 @@ imb_UCS2LCh( float *p, float *q, int n )
 int 
 im_UCS2LCh( IMAGE *in, IMAGE *out )
 {
+	im_col_make_tables_UCS();
+
 	return( im__colour_unary( "im_UCS2LCh", in, out, IM_TYPE_UCS,
 		(im_wrapone_fn) imb_UCS2LCh, NULL, NULL ) );
 }
diff --git a/tools/scripts/Makefile.am b/tools/scripts/Makefile.am
index feb7a315..91460f08 100644
--- a/tools/scripts/Makefile.am
+++ b/tools/scripts/Makefile.am
@@ -4,12 +4,12 @@ bin_SCRIPTS = \
 	batch_image_convert \
 	batch_rubber_sheet \
 	batch_crop \
-	vips-7.20
+	vips-7.21
 
 noinst_SCRIPTS = post_install
 
 EXTRA_DIST = \
-	vips-7.20 \
+	vips-7.21 \
 	${noinst_SCRIPTS} \
 	light_correct.in \
 	shrink_width.in \
diff --git a/tools/scripts/vips-7.20 b/tools/scripts/vips-7.21
similarity index 100%
rename from tools/scripts/vips-7.20
rename to tools/scripts/vips-7.21
diff --git a/vips-7.20.pc.in b/vips-7.21.pc.in
similarity index 100%
rename from vips-7.20.pc.in
rename to vips-7.21.pc.in
diff --git a/vipsCC-7.20.pc.in b/vipsCC-7.21.pc.in
similarity index 100%
rename from vipsCC-7.20.pc.in
rename to vipsCC-7.21.pc.in