From 6f101ae86b4665b3a834cba3b7158adecb2a90d6 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 6 Jan 2015 12:00:11 +0000
Subject: [PATCH] remove VImage::scale()

it clashed with the VipsScale operator, see

https://github.com/jcupitt/libvips/pull/213
---
 ChangeLog                        |  2 ++
 cplusplus/include/vips/VImage8.h | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f85862b..ab59c1e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 30/12/14 started 7.42.2
 - C++ required output params were broken, thanks Lovell
+- remove VImage::scale() to get scale from header, it clashed with the
+  VipsScale operator, thanks Lovell
 - allow c++ set enum from string
 - display param default and range in usage
 - better docs
diff --git a/cplusplus/include/vips/VImage8.h b/cplusplus/include/vips/VImage8.h
index 2bf870de..4a502e42 100644
--- a/cplusplus/include/vips/VImage8.h
+++ b/cplusplus/include/vips/VImage8.h
@@ -323,18 +323,6 @@ public:
 		return( vips_image_get_filename( get_image() ) ); 
 	}
 
-	double 
-	scale()
-	{
-		return( vips_image_get_scale( get_image() ) ); 
-	}
-
-	double 
-	offset()
-	{
-		return( vips_image_get_offset( get_image() ) ); 
-	}
-
 	const void *
 	data()
 	{