From c2a8c542b608822a54314ab0059e905d89aea370 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sun, 29 Jun 2014 11:17:23 +0100
Subject: [PATCH] we assumed GType fitted in an int

which isn't true on freebsd, and perhaps others
---
 ChangeLog                |  1 +
 TODO                     |  3 ---
 libvips/iofuncs/object.c | 48 ++++++++++++++++++++++++++--------------
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23d4f1ab..6e55d75d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 - improve short option name handling, thanks bgilbert
 - added --enable-docs configure option to help freebsd
 - removed a bash-ism from configure to help freebsd
+- don't assume GType fits in an int to help freebsd
 
 24/6/14 started 7.40.1
 - revise man.1 pages
diff --git a/TODO b/TODO
index 4905a8df..a8297c31 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,3 @@
-- need a --nodoc flag for freebsd
-
-  stops anything in doc/ running
 
 - threadpool recyling might be useful for dzsave?
 
diff --git a/libvips/iofuncs/object.c b/libvips/iofuncs/object.c
index 00fdc59a..abbff396 100644
--- a/libvips/iofuncs/object.c
+++ b/libvips/iofuncs/object.c
@@ -2541,25 +2541,36 @@ vips_class_find( const char *basename, const char *nickname )
 	return( class );
 }
 
+/* What we store for each nickname. We can't just store the type with
+ * GINT_TO_POINTER() since GType is 64 bits on some platforms.
+ */
+typedef struct _NicknameGType {
+	const char *nickname;
+	GType type;
+	gboolean duplicate;
+} NicknameGType;
+
 static void *
 vips_class_add_hash( VipsObjectClass *class, GHashTable *table )
 {
 	GType type = G_OBJECT_CLASS_TYPE( class );
+	NicknameGType *hit;
 
-	/* If this is not a unique name, store -1 for the GType. In this case
+	hit = (NicknameGType *) 
+		g_hash_table_lookup( table, (void *) class->nickname );
+
+	/* If this is not a unique name, mark as a duplicate. In this case
 	 * we'll need to fall back to a search.
 	 */
-	if( g_hash_table_lookup( table, (void *) class->nickname ) ) {
-		g_hash_table_insert( table, 
-			(void *) class->nickname, GINT_TO_POINTER( -1 ) );
-#ifdef DEBUG
-		printf( "vips_class_add_hash: duplicate nickname %s\n", 
-			class->nickname );
-#endif /*DEBUG*/
+	if( hit ) 
+		hit->duplicate = TRUE;
+	else {
+		hit = g_new( NicknameGType, 1 );
+		hit->nickname = class->nickname;
+		hit->type = type;
+		hit->duplicate = FALSE;
+		g_hash_table_insert( table, (void *) hit->nickname, hit );
 	}
-	else
-		g_hash_table_insert( table, 
-			(void *) class->nickname, GINT_TO_POINTER( type ) );
 
 	return( NULL ); 
 }
@@ -2587,27 +2598,32 @@ vips_type_find( const char *basename, const char *nickname )
 
 	const char *classname = basename ? basename : "VipsObject";
 
+	NicknameGType *hit;
 	GType base;
 	GType type;
 
 	vips__object_nickname_table = (GHashTable *) g_once( &once, 
 		(GThreadFunc) vips_class_build_hash, NULL ); 
 
-	type = GPOINTER_TO_INT( g_hash_table_lookup( 
-		vips__object_nickname_table, (void *) nickname ) );
+	hit = (NicknameGType *) 
+		g_hash_table_lookup( vips__object_nickname_table, 
+			(void *) nickname );
 
 	/* We must only search below basename ... check that the cache hit is
 	 * in the right part of the tree.
 	 */
 	if( !(base = g_type_from_name( classname )) )
 		return( 0 );
-	if( !type ||
-		type == -1 ||
-		!g_type_is_a( type, base ) ) {
+	if( hit &&
+		!hit->duplicate &&
+		g_type_is_a( hit->type, base ) ) 
+		type = hit->type;
+	else {
 		VipsObjectClass *class;
 
 		if( !(class = vips_class_find( basename, nickname )) )
 			return( 0 );
+
 		type = G_OBJECT_CLASS_TYPE( class );
 	}