From 101c60cf42b9f0cabf27aa5cff4fcf895fbd6705 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 13 Jul 2013 13:02:06 +0100
Subject: [PATCH] add a "const" to get_string

---
 libvips/foreign/radiance.c    | 2 +-
 libvips/foreign/tiffsave.c    | 2 +-
 libvips/foreign/vips2jpeg.c   | 4 ++--
 libvips/include/vips/header.h | 2 +-
 libvips/iofuncs/header.c      | 3 ++-
 libvips/iofuncs/image.c       | 2 +-
 tools/vipsthumbnail.c         | 4 +---
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libvips/foreign/radiance.c b/libvips/foreign/radiance.c
index 34d1dea6..78046233 100644
--- a/libvips/foreign/radiance.c
+++ b/libvips/foreign/radiance.c
@@ -1056,7 +1056,7 @@ write_new( VipsImage *in, const char *filename )
 static int
 vips2rad_put_header( Write *write )
 {
-	char *str;
+	const char *str;
 	int i, j;
 	double d;
 
diff --git a/libvips/foreign/tiffsave.c b/libvips/foreign/tiffsave.c
index f126325a..68d7b50a 100644
--- a/libvips/foreign/tiffsave.c
+++ b/libvips/foreign/tiffsave.c
@@ -88,7 +88,7 @@ vips_foreign_save_tiff_build( VipsObject *object )
 	VipsForeignSave *save = (VipsForeignSave *) object;
 	VipsForeignSaveTiff *tiff = (VipsForeignSaveTiff *) object;
 
-	char *p;
+	const char *p;
 
 	if( VIPS_OBJECT_CLASS( vips_foreign_save_tiff_parent_class )->
 		build( object ) )
diff --git a/libvips/foreign/vips2jpeg.c b/libvips/foreign/vips2jpeg.c
index 8621387d..598b1b49 100644
--- a/libvips/foreign/vips2jpeg.c
+++ b/libvips/foreign/vips2jpeg.c
@@ -452,7 +452,7 @@ static int
 set_exif_resolution( ExifData *ed, VipsImage *im )
 {
 	double xres, yres;
-	char *p;
+	const char *p;
 	int unit;
 
 	VIPS_DEBUG_MSG( "set_exif_resolution: vips res of %g, %g\n",
@@ -578,7 +578,7 @@ static void
 vips_exif_update_entry( ExifEntry *entry, VipsExif *ve )
 {
 	char name[256];
-	char *value;
+	const char *value;
 
 	vips_snprintf( name, 256, "exif-ifd%d-%s", 
 		exif_entry_get_ifd( entry ),
diff --git a/libvips/include/vips/header.h b/libvips/include/vips/header.h
index 898f3a43..95da4126 100644
--- a/libvips/include/vips/header.h
+++ b/libvips/include/vips/header.h
@@ -149,7 +149,7 @@ int vips_image_get_double( const VipsImage *image,
 	const char *field, double *out );
 void vips_image_set_double( VipsImage *image, const char *field, double d );
 int vips_image_get_string( const VipsImage *image, 
-	const char *field, char **out );
+	const char *field, const char **out );
 void vips_image_set_string( VipsImage *image, 
 	const char *field, const char *str );
 
diff --git a/libvips/iofuncs/header.c b/libvips/iofuncs/header.c
index a4187fe5..c625dc51 100644
--- a/libvips/iofuncs/header.c
+++ b/libvips/iofuncs/header.c
@@ -1357,7 +1357,8 @@ vips_image_set_double( VipsImage *image, const char *field, double d )
  * Returns: 0 on success, -1 otherwise.
  */
 int
-vips_image_get_string( const VipsImage *image, const char *field, char **out )
+vips_image_get_string( const VipsImage *image, const char *field, 
+	const char **out )
 {
 	int i;
 	GValue value_copy = { 0 };
diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c
index 4a64f651..e4d4e62a 100644
--- a/libvips/iofuncs/image.c
+++ b/libvips/iofuncs/image.c
@@ -418,7 +418,7 @@ static void
 vips_image_summary( VipsObject *object, VipsBuf *buf )
 {
 	VipsImage *image = VIPS_IMAGE( object );
-	char *p;
+	const char *p;
 
 	vips_buf_appendf( buf, "%dx%d",
 		vips_image_get_width( image ), vips_image_get_height( image ) );
diff --git a/tools/vipsthumbnail.c b/tools/vipsthumbnail.c
index a01cb659..f55c17ea 100644
--- a/tools/vipsthumbnail.c
+++ b/tools/vipsthumbnail.c
@@ -148,9 +148,7 @@ calculate_shrink( int width, int height, double *residual )
 static int
 thumbnail_find_jpegshrink( VipsImage *im )
 {
-	int shrink;
-
-	shrink = calculate_shrink( im->Xsize, im->Ysize, NULL );
+	int shrink = calculate_shrink( im->Xsize, im->Ysize, NULL );
 
 	if( shrink >= 8 )
 		return( 8 );