ruby-vips 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # master 
 
+# Version 0.3.2
+
+### Fixed
+
+* Workaround helps ruby-vips compile (and run) against 7.26.3 [John Cupitt and 
+James Harrison]
+
 # Version 0.3.1
 
 ### Fixed

data/ext/ruby_vips.c

@@ -1,5 +1,46 @@
 #include "ruby_vips.h"
 
+/* vips-7.26.3 and earlier 7.26 (used on Ubuntu 12.04) had a broken
+ * vips_class_map_all(). ruby_vips.h turns on NEED_ruby_vips_class_map_all if
+ * we need to define our own, working version. 
+ */
+#ifdef NEED_ruby_vips_class_map_all
+static void *
+ruby_vips_type_map( GType base, VipsTypeMap2 fn, void *a, void *b )
+{
+	GType *child;
+	guint n_children;
+	unsigned int i;
+	void *result;
+
+	child = g_type_children( base, &n_children );
+	result = NULL;
+	for( i = 0; i < n_children && !result; i++ )
+		result = fn( child[i], a, b );
+	g_free( child );
+
+	return( result );
+}
+
+void *
+ruby_vips_class_map_all( GType type, VipsClassMap fn, void *a )
+{
+	void *result;
+
+	if( !G_TYPE_IS_ABSTRACT( type ) ) {
+		if( (result = fn( 
+			VIPS_OBJECT_CLASS( g_type_class_ref( type ) ), a )) )
+			return( result );
+	}
+
+	if( (result = vips_type_map( type, 
+		(VipsTypeMap2) vips_class_map_all, fn, a )) )
+		return( result );
+
+	return( NULL );
+}
+#endif /*NEED_ruby_vips_class_map_all*/
+
 VALUE mVIPS, eVIPSError;
 
 void

data/ext/ruby_vips.h

@@ -36,6 +36,15 @@ void vips_lib_error();
 #define im_openout( F ) vips_image_new_mode( F, "w" )
 #endif /*im_openout*/
 
+/* vips-7.26.3 and earlier 7.26 (used on Ubuntu 12.04) was missing a compat
+ * macro for vips_class_map_concrete_all(). Additionally, the
+ * vips_class_map_all() in libvips was broken .. turn on our own definition.
+ */
+#ifndef vips_class_map_concrete_all
+#define vips_class_map_concrete_all ruby_vips_class_map_all
+#define NEED_ruby_vips_class_map_all
+#endif
+
 #include "header.h"
 #include "image_arithmetic.h"
 #include "image_boolean.h"

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/ruby-vips.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2012-08-30"
+  s.date = "2012-08-31"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-vips
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Timothy Elliott
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 Z
+date: 2012-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement