ruby-vips 0.2.1 → 0.3.0

data/ext/writer.h

@@ -0,0 +1,2 @@
+void init_Writer(void);
+

data/lib/vips/reader.rb

@@ -4,60 +4,24 @@ module VIPS
 
     def initialize(path, options={})
       @path = path
-      read_header path unless options[:skip_header]
-    end
-
-    def self.read(path, options={})
-      options[:skip_header] = true
-      reader = new path, options
-      reader.read
+      @_im = nil
     end
 
     def read
-      read_internal @path
-    end
-  end
-
-  class CSVReader < Reader
-    attr_reader :line_skip, :line_limit
-    attr_accessor :whitespace, :separator
-
-    # Creates a CSV reader.
-    def initialize(path, options={})
-      @line_skip = options[:line_skip] || 0
-      @whitespace = options[:whitespace] || ' "'
-      @separator = options[:separator] || ";,\t"
-      @line_limit = options[:line_limit] || 0
-
-      super path, options
-    end
-
-    # Read the CSV file and return a VIPS Image object.
-    def read
-      str = "#{@path}:ski:#{@line_skip},whi:#{@whitespace}"
-      str << ",lin:#{@line_limit == 0 ? -1 : @line_limit}"
-
-      # VIPS magic open path limitation/bug -- we cannot specify the comma char
-      str << ",sep:#{@separator}" unless @separator[/,/]
-      read_internal str
-    end
-
-    # Set the number of lines to skip at the beginning of the file.
-    def line_skip=(line_skip_v)
-      if line_skip_v < 0
-        raise ArgumentError, "Line skip must be 0 or more."
+      # in case the sub-class has not read it
+      if not @_im 
+          @_im = read_internal @path, 0
       end
-
-      @line_skip = line_skip_v
+      @_im
     end
 
-    # Set a limit of how many lines to read in.
-    def line_limit=(line_limit_v)
-      if line_limit_v < 0
-        raise ArgumentError, "Line limit must be 0 (read all) or more."
-      end
+    # support these two for compat with older ruby-vips
+    def x_size
+        @_im.x_size
+    end
 
-      @line_limit = line_limit_v
+    def y_size
+        @_im.y_size
     end
   end
 
@@ -77,18 +41,19 @@ module VIPS
       super path, options
     end
 
-    # Read the jpeg file from disk and return a VIPS Image object.
     def read
       str = "#{@path}:#{shrink_factor}"
       str << "," 
       str << "fail" if @fail_on_warn
 
+      seq = 0
       if Vips.sequential_mode_supported?
         str << "," 
         str << "sequential" if @sequential
+        seq = 1
       end
 
-      read_internal str
+      @_im = read_internal str, seq
     end
 
     # Shrink the jpeg while reading from disk. This means that the entire image
@@ -103,6 +68,49 @@ module VIPS
     end
   end
 
+  class CSVReader < Reader
+    attr_reader :line_skip, :line_limit
+    attr_accessor :whitespace, :separator
+
+    # Creates a CSV reader.
+    def initialize(path, options={})
+      @line_skip = options[:line_skip] || 0
+      @whitespace = options[:whitespace] || ' "'
+      @separator = options[:separator] || ";,\t"
+      @line_limit = options[:line_limit] || 0
+
+      super path, options
+    end
+
+    def read
+      str = "#{@path}:ski:#{@line_skip},whi:#{@whitespace}"
+      str << ",lin:#{@line_limit == 0 ? -1 : @line_limit}"
+
+      # VIPS magic open path limitation/bug -- we cannot specify the comma char
+      str << ",sep:#{@separator}" unless @separator[/,/]
+
+      @_im = read_internal str, 0
+    end
+
+    # Set the number of lines to skip at the beginning of the file.
+    def line_skip=(line_skip_v)
+      if line_skip_v < 0
+        raise ArgumentError, "Line skip must be 0 or more."
+      end
+
+      @line_skip = line_skip_v
+    end
+
+    # Set a limit of how many lines to read in.
+    def line_limit=(line_limit_v)
+      if line_limit_v < 0
+        raise ArgumentError, "Line limit must be 0 (read all) or more."
+      end
+
+      @line_limit = line_limit_v
+    end
+  end
+
   class TIFFReader < Reader
     attr_reader :page_number
     attr_accessor :sequential
@@ -116,17 +124,18 @@ module VIPS
       super path, options
     end
 
-    # Read the tiff file from disk and return a VIPS Image object.
     def read
       str = "#{@path}:"
       str << "#{@page_number}" if @page_number
 
+      seq = 0
       if Vips.sequential_mode_supported?
         str << ","
         str << "sequential" if @sequential
+        seq = 1
       end
 
-      read_internal str
+      @_im = read_internal str, seq
     end
 
     # Select which page in a multiple-page tiff to read. When set to nil, all
@@ -150,16 +159,17 @@ module VIPS
       super path, options
     end
 
-    # Read the png file from disk and return a VIPS Image object.
     def read
       str = @path
 
+      seq = 0
       if Vips.sequential_mode_supported?
         str << ":"
         str << "sequential" if @sequential
+        seq = 1
       end
 
-      read_internal str
+      @_im = read_internal str, seq
     end
   end
 
@@ -167,49 +177,49 @@ module VIPS
 
     # Load a ppm file straight to a VIPS Image.
     def self.ppm(*args)
-      PPMReader.read *args
+      PPMReader.new(*args).read
     end
 
     # Load an exr file straight to a VIPS Image.
     def self.exr(*args)
-      EXRReader.read *args
+      EXRReader.new(*args).read
     end
 
     # Load a csv file straight to a VIPS Image.
     def self.csv(*args)
-      CSVReader.read *args
+      CSVReader.new(*args).read
     end
 
     # Load a jpeg file straight to a VIPS Image.
     def self.jpeg(*args)
-      JPEGReader.read *args
+      JPEGReader.new(*args).read
     end
 
     # Load a file straight to a VIPS Image using the magick library.
     def self.magick(*args)
-      MagickReader.read *args
+      MagickReader.new(*args).read
     end
 
     # Load a png file straight to a VIPS Image.
     def self.png(*args)
-      PNGReader.read *args
+      PNGReader.new(*args).read
     end
 
     # Load a tiff file straight to a VIPS Image.
     def self.tiff(*args)
-      TIFFReader.read *args
+      TIFFReader.new(*args).read
     end
 
     # Load a native vips file straight to a VIPS Image.
     def self.vips(*args)
-      VIPSReader.read *args
+      VIPSReader.new(*args).read
     end
 
     # Load any file straight to a VIPS Image. VIPS will determine the format
     # based on the file extension. If the extension is not recognized, VIPS
     # will look at the file signature.
     def self.new(*args)
-      Reader.read *args
+      Reader.new(*args).read
     end
   end
 end

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module VIPS
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/ruby-vips.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-vips"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Elliott", "John Cupitt"]
-  s.date = "2012-07-16"
+  s.date = "2012-07-24"
   s.description = "Ruby extension for the vips image processing library."
   s.email = "jcupitt@gmail.com"
   s.extensions = ["ext/extconf.rb"]
@@ -54,14 +54,17 @@ Gem::Specification.new do |s|
     "ext/mask.c",
     "ext/mask.h",
     "ext/reader.c",
+    "ext/reader.h",
     "ext/ruby_vips.c",
     "ext/ruby_vips.h",
     "ext/writer.c",
+    "ext/writer.h",
     "lib/vips.rb",
     "lib/vips/reader.rb",
     "lib/vips/version.rb",
     "lib/vips/writer.rb",
-    "ruby-vips.gemspec"
+    "ruby-vips.gemspec",
+    "ruby.supp"
   ]
   s.homepage = "http://github.com/jcupitt/ruby-vips"
   s.licenses = ["MIT"]

data/ruby.supp

@@ -0,0 +1,194 @@
+# 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
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	val4
+	Memcheck:Value8
+	...
+	obj:/usr/lib/libruby1.8.so.1.8.7
+	fun:rb_newobj
+	fun:rb_node_newnode
+	fun:ruby_yyparse
+}
+
+{
+	cond4
+	Memcheck:Cond
+	...
+	obj:/usr/lib/libruby1.8.so.1.8.7
+	fun:rb_newobj
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	val7a
+	Memcheck:Value8
+	...
+	obj:/usr/lib/libruby1.8.so.1.8.7
+	fun:rb_newobj
+	fun:rb_node_newnode
+	fun:rb_iterate
+	...
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+{
+	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
+}
+
+
+