From 3faffa4c544b4159498ff9558bc7e4725a9fb939 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 5 Jun 2014 08:51:31 +0100
Subject: [PATCH] reenable orc program free

The bug has been fixed, see:

https://bugzilla.gnome.org/show_bug.cgi?id=731227

Summary:
	orc pre-0.4.19 leaks
	orc 0.4.19 crashes
	orc 0.4.20+ has few leaks and does not crash
---
 libvips/iofuncs/vector.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libvips/iofuncs/vector.c b/libvips/iofuncs/vector.c
index 55e03c6e..9c579dfb 100644
--- a/libvips/iofuncs/vector.c
+++ b/libvips/iofuncs/vector.c
@@ -113,18 +113,19 @@ void
 vips_vector_free( VipsVector *vector )
 {
 #ifdef HAVE_ORC
-	/* orc-0.4.19 and perhaps some others produce a lot of valgrind
-	 * errors and maybe some double-frees in orc_program_free().
+	/* orc-0.4.19 will crash if you free programs. Update your orc, or
+	 * comment out this line. 
 	 *
-	 * Comment out (and live with the leak) until this is fixed.
+	 * See https://bugzilla.gnome.org/show_bug.cgi?id=731227
+	 *
+	 * orc does not set any version variables so we can't disable this
+	 * free automatically.
 	 */
 #ifdef DEBUG_TRACE
 	printf( "orc_program_free( %s );\n", vector->unique_name ); 
 	printf( "%s = NULL;\n", vector->unique_name ); 
 #endif /*DEBUG_TRACE*/
-	/*
 	VIPS_FREEF( orc_program_free, vector->program );
-	 */
 #endif /*HAVE_ORC*/
 	VIPS_FREE( vector->unique_name );
 	VIPS_FREE( vector );