ruby-vips 0.3.8 → 0.3.9

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # master 
 
+# Version 0.3.9
+
+* removed a stray file from gemspec [Alessandro Tagliapietra]
+* updated bundle [John Cupitt]
+* revised spec tests [John Cupitt]
+* fix a segv in im.label_regions [John Cupitt]
+* add a Valgrind suppressions file [John Cupitt]
+* fix .monotonic? [John Cupitt]
+* fix .data on coded images [John Cupitt]
+* add .size, see issue #58 [John Cupitt]
+* add rdoc-data dep, maybe it will help ruby-gems docs [John Cupitt]
+
 # Version 0.3.8
 
 * add VIPS::thread_shutdown(), must be called on foreign thread exit [John Cupitt]

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
     diff-lcs (1.2.5)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    git (1.2.6)
+    git (1.2.7)
     github_api (0.10.1)
       addressable
       faraday (~> 0.8.1)
@@ -14,8 +14,8 @@ GEM
       multi_json (~> 1.4)
       nokogiri (~> 1.5.2)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
+    hashie (3.2.0)
+    highline (1.6.21)
     jeweler (1.8.8)
       builder
       bundler (~> 1.0)
@@ -26,30 +26,35 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    multi_json (1.8.4)
+    jwt (1.0.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
-    oauth2 (0.9.3)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.1)
-    rdoc (3.12.2)
+    rake (10.2.2)
+    rdoc (4.1.1)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
+    rdoc-data (4.0.1)
+      rdoc (~> 4.0)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
 
 PLATFORMS
   ruby
@@ -57,5 +62,6 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler (~> 1.8.3)
-  rdoc (~> 3.12)
+  rdoc (~> 4.1)
+  rdoc-data (~> 4.0)
   rspec

data/TODO

@@ -1,3 +1,5 @@
+- add something to make a memory image, useful in some cases, eg. making very
+  large image mosaics
 
 - support vips_flatten(), see 
 

data/ext/header.c

@@ -78,6 +78,24 @@ header_y_size(VALUE obj)
     return Qnil;
 }
 
+/*
+ *  call-seq:
+ *     im.size -> [width, height]
+ *
+ *  Get the size of the image in pixels.
+ */
+
+static VALUE
+header_size(VALUE obj)
+{
+	GetImg(obj, data, im);
+
+    if (im)
+    	return rb_ary_new3(2, INT2FIX(im->Xsize), INT2FIX(im->Ysize));
+
+    return Qnil;
+}
+
 /*
  *  call-seq:
  *    im.bands -> number
@@ -403,6 +421,7 @@ init_Header( void )
 
     rb_define_method(mVIPSHeader, "x_size", header_x_size, 0);
     rb_define_method(mVIPSHeader, "y_size", header_y_size, 0);
+    rb_define_method(mVIPSHeader, "size", header_size, 0);
     rb_define_method(mVIPSHeader, "bands", header_bands, 0);
     rb_define_method(mVIPSHeader, "band_fmt", header_band_fmt, 0);
     rb_define_method(mVIPSHeader, "x_res", header_x_res, 0);

data/ext/image.c

@@ -341,7 +341,7 @@ img_data(VALUE obj)
 {
     GetImg(obj, data, im);
 
-    if (im_incheck(im) || im_check_uncoded("img_aref", im))
+    if (im_incheck(im) )
         return( Qnil );
 
     return rb_tainted_str_new((const char *) im->data, 

data/ext/image_histograms_lut.c

@@ -351,7 +351,7 @@ img_monotonic_p(VALUE obj)
 	if( im_ismonotonic(im, &ret) )
 	    vips_lib_error();
 
-	return( ret == 0 ? Qtrue : Qfalse );
+	return( ret == 0 ? Qfalse : Qtrue );
 }
 
 /*

data/ext/image_morphology.c

@@ -323,5 +323,5 @@ img_label_regions(VALUE obj)
     if (im_label_regions(im, im_new, &segments))
         vips_lib_error();
 
-    return rb_ary_new3(2, new, segments);
+    return rb_ary_new3(2, new, INT2NUM(segments));
 }

data/ext/tags

@@ -4,17 +4,18 @@
 !_TAG_PROGRAM_NAME	Exuberant Ctags	//
 !_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
 !_TAG_PROGRAM_VERSION	5.9~svn20110310	//
+ATLEAST_VIPS	ruby_vips.h	19;"	d
 CGETPIX	image.c	241;"	d	file:
-DBL2NUM	ruby_vips.h	20;"	d
+DBL2NUM	ruby_vips.h	26;"	d
 GETPIX	image.c	228;"	d	file:
 GetImg	image.h	26;"	d
 Init_vips_ext	ruby_vips.c	/^Init_vips_ext()$/;"	f
-NEED_ruby_vips_class_map_all	ruby_vips.h	45;"	d
+NEED_ruby_vips_class_map_all	ruby_vips.h	51;"	d
 OutImg	image.h	32;"	d
 OutImg2	image.h	36;"	d
 OutImg3	image.h	40;"	d
 OutPartial	image.h	44;"	d
-RARRAY_LENINT	ruby_vips.h	24;"	d
+RARRAY_LENINT	ruby_vips.h	30;"	d
 RUBY_VIPS_BINARY	image.h	59;"	d
 RUBY_VIPS_H	ruby_vips.h	2;"	d
 RUBY_VIPS_HEADER_H	header.h	2;"	d
@@ -102,8 +103,8 @@ id_ushort	header.c	/^static ID id_notset, id_uchar, id_char, id_ushort, id_short
 id_white	image_conversion.c	/^static ID id_black, id_extend, id_repeat, id_mirror, id_white;$/;"	v	file:
 id_xyz	image.c	/^static ID id_b_w, id_histogram, id_fourier, id_xyz, id_lab, id_cmyk, id_labq,$/;"	v	file:
 id_yxy	image.c	/^    id_rgb, id_ucs, id_lch, id_labs, id_srgb, id_yxy, id_rgb16, id_grey16;$/;"	v	file:
-im_openout	ruby_vips.h	35;"	d
-im_openout	ruby_vips.h	36;"	d
+im_openout	ruby_vips.h	41;"	d
+im_openout	ruby_vips.h	42;"	d
 imask	mask.h	/^  INTMASK *imask;$/;"	m	struct:_vipsMask
 imask2rb	mask.c	/^imask2rb(INTMASK *msk)$/;"	f
 img_abs	image_arithmetic.c	/^img_abs(VALUE obj)$/;"	f
@@ -419,11 +420,12 @@ mask_scale	mask.c	/^mask_scale(VALUE obj)$/;"	f	file:
 mask_to_image	mask.c	/^mask_to_image(VALUE obj)$/;"	f	file:
 mask_xsize	mask.c	/^mask_xsize(VALUE obj)$/;"	f	file:
 mask_ysize	mask.c	/^mask_ysize(VALUE obj)$/;"	f	file:
+png_buf_internal	reader.c	/^png_buf_internal(VALUE obj, VALUE buf)$/;"	f	file:
 png_buf_internal	writer.c	/^png_buf_internal(VALUE obj, VALUE compression, VALUE interlace)$/;"	f	file:
 png_write_internal	writer.c	/^png_write_internal(VALUE obj, VALUE path)$/;"	f	file:
 ppm_write_internal	writer.c	/^ppm_write_internal(VALUE obj, VALUE path)$/;"	f	file:
 raw_read_internal	reader.c	/^raw_read_internal(VALUE obj, VALUE path, VALUE width, VALUE height, VALUE bpp,$/;"	f	file:
-rb_str_new_cstr	ruby_vips.h	28;"	d
+rb_str_new_cstr	ruby_vips.h	34;"	d
 reader_fmt_set	reader.c	/^reader_fmt_set(VALUE klass, const char* val)$/;"	f	file:
 reader_get_fmt_class	reader.c	/^reader_get_fmt_class(VALUE klass)$/;"	f
 reader_read_internal	reader.c	/^reader_read_internal(VALUE obj, VALUE path, VALUE flags)$/;"	f	file:
@@ -433,9 +435,10 @@ ruby_vips_type_map	ruby_vips.c	/^ruby_vips_type_map( GType base, VipsTypeMap2 fn
 tiff_write_internal	writer.c	/^tiff_write_internal(VALUE obj, VALUE path)$/;"	f	file:
 vipsImg	image.h	/^typedef struct _vipsImg vipsImg;$/;"	t	typeref:struct:_vipsImg
 vipsMask	mask.h	/^typedef struct _vipsMask vipsMask;$/;"	t	typeref:struct:_vipsMask
-vips_class_map_concrete_all	ruby_vips.h	44;"	d
+vips_class_map_concrete_all	ruby_vips.h	50;"	d
 vips_lib_error	ruby_vips.c	/^vips_lib_error()$/;"	f
 vips_s_debug_info	ruby_vips.c	/^vips_s_debug_info(VALUE obj)$/;"	f	file:
+vips_s_thread_shutdown	ruby_vips.c	/^vips_s_thread_shutdown(VALUE obj)$/;"	f	file:
 vips_s_version_array	ruby_vips.c	/^vips_s_version_array()$/;"	f	file:
 vips_s_version_string	ruby_vips.c	/^vips_s_version_string()$/;"	f	file:
 vips_write_internal	writer.c	/^vips_write_internal(VALUE obj, VALUE path)$/;"	f	file:

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/ruby-vips.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2014-05-11"
+  s.date = "2014-07-17"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]
@@ -78,18 +78,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_development_dependency(%q<rdoc-data>, ["~> 4.0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_dependency(%q<rdoc-data>, ["~> 4.0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<rdoc>, ["~> 4.1"])
+    s.add_dependency(%q<rdoc-data>, ["~> 4.0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/ruby.supp

@@ -1,194 +1,134 @@
-# valgrind suppressions file for ubuntu 12.04
-# with this set of suppressions I can run 
-#   valgrind --db-attach=yes ruby -S rspec spec/vips/vips_reader_spec.rb ..
-# successfully
+# valgrind suppressions file for ruby1.9.1
+
+# handy for debugging spec fails, eg.
+#
+# $ export G_DEBUG=gc-friendly
+# $ export G_SLICE=always-malloc
+# $ valgrind --db-attach=yes -- ruby -S rspec spec/vips/morphology_spec.rb
 
 {
-	cond1
-	Memcheck:Cond
-	...
-	fun:rb_newobj
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_str_buf_new
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_yyparse
+   ruby1
+   Memcheck:Cond
+   ...
+   fun:rb_parser_compile_file
 }
 
 {
-	val1
-	Memcheck:Value8
-	...
-	fun:rb_newobj
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_str_buf_new
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_yyparse
+   ruby2
+   Memcheck:Value8
+   ...
+   fun:rb_parser_compile_file
 }
 
 {
-	cond2
-	Memcheck:Cond
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_str_new3
+   ruby3
+   Memcheck:Cond
+   ...
+   fun:rb_file_expand_path
 }
 
 {
-	val2
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_str_new3
+   ruby4
+   Memcheck:Value8
+   ...
+   fun:rb_file_expand_path
 }
 
+# happens a lot during compile
 {
-	cond3
-	Memcheck:Cond
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	fun:rb_node_newnode
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_yyparse
+   ruby5
+   Memcheck:Addr4
+   obj:/usr/lib/libruby-1.9.1.so.1.9.1
+   ...
+   fun:rb_ary_each
 }
 
 {
-	val3
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	fun:rb_node_newnode
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_yyparse
+   ruby5a
+   Memcheck:Cond
+   obj:/usr/lib/libruby-1.9.1.so.1.9.1
+   fun:rb_newobj
 }
 
 {
-	val4
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	fun:rb_node_newnode
-	fun:ruby_yyparse
+   ruby6
+   Memcheck:Cond
+   ...
+   fun:rb_iseq_compile_with_option
 }
 
 {
-	cond4
-	Memcheck:Cond
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
+   ruby7
+   Memcheck:Value8
+   ...
+   fun:rb_iseq_compile_with_option
 }
 
 {
-	val5
-	Memcheck:Value8
-	fun:st_lookup
-	fun:rb_mark_generic_ivar
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
+   ruby8
+   Memcheck:Cond
+   ...
+   fun:st_init_table_with_size
 }
 
 {
-	val6
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:img_each_pixel
+   ruby9
+   Memcheck:Value8
+   ...
+   fun:st_init_table_with_size
 }
 
 {
-	val6a
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	fun:rb_float_new
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
+   ruby10
+   Memcheck:Cond
+   ...
+   fun:rb_iseq_compile_node
 }
 
 {
-	val7
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_ary_each
+   ruby11
+   Memcheck:Value8
+   ...
+   fun:rb_iseq_compile_node
 }
 
 {
-	val7a
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_newobj
-	fun:rb_node_newnode
-	fun:rb_iterate
-	...
+   ruby12
+   Memcheck:Cond
+   obj:/usr/lib/libruby-1.9.1.so.1.9.1
+   ...
+   fun:rb_node_newnode
 }
 
 {
-	cond5
-	Memcheck:Cond
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_xmalloc
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_reg_new
+   ruby13
+   Memcheck:Value8
+   obj:/usr/lib/libruby-1.9.1.so.1.9.1
+   ...
+   fun:rb_node_newnode
 }
 
 {
-	val8
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_xmalloc
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:rb_reg_new
+   ruby14
+   Memcheck:Cond
+   obj:/usr/lib/libruby-1.9.1.so.1.9.1
+   ...
+   fun:Init_sha1
 }
 
 {
-	cond6
-	Memcheck:Cond
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_xmalloc
-	fun:st_add_direct
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:st_foreach
+   ruby15
+   Memcheck:Addr8
+   obj:/usr/lib/libruby-1.9.1.so.1.9.1
+   ...
+   fun:rb_yield
 }
 
 {
-	val9
-	Memcheck:Value8
-	...
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:ruby_xmalloc
-	fun:st_add_direct
-	obj:/usr/lib/libruby1.8.so.1.8.7
-	fun:st_foreach
+   ruby16
+   Memcheck:Value8
+   obj:/usr/lib/libruby-1.9.1.so.1.9.1
+   fun:rb_newobj
 }
 
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: rdoc-data
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 608630802592582756
+      hash: -1056499539870116090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: