fix stream*u example

jcupitt · jcupitt · commit dab4f391900a · 2019-12-05T10:00:34.000Z
all seems to be working now
diff --git a/example/stream.rb b/example/stream.rb
@@ -3,49 +3,55 @@
 require 'vips'
 
 class Mystreami < Vips::Streamiu
-  def initialize(filename)
-    puts "Mystreami: initialize"
-
+  def initialize(filename, pipe_mode=false)
     @filename = filename
-    @contents = File.read(@filename)
+    @contents = File.open(@filename, "rb").read
     @length = @contents.length
+    @pipe_mode = pipe_mode
     @read_point = 0
 
     super()
 
     signal_connect "read" do |buf, len|
-      puts "Mystreami read: #{len} bytes"
-
       bytes_available = @length - @read_point
       bytes_to_copy = [bytes_available, len].min
-      puts "Mystreami read: #{bytes_available} bytes_available"
-      puts "Mystreami read: #{bytes_to_copy} bytes_to_copy"
       buf.put_bytes(0, @contents, @read_point, bytes_to_copy)
       @read_point += bytes_to_copy
 
       bytes_to_copy
     end
 
     signal_connect "seek" do |offset, whence|
-      puts "Mystreami seek: offset #{offset}, whence #{whence}"
-      -1
+      return -1 if @pipe_mode
+
+      case whence 
+      when 0
+        # SEEK_SET
+        new_read_point = offset
+      when 1
+        # SEEK_CUR
+        new_read_point = self.read_point + offset
+      when 2
+        # SEEK_END
+        new_read_point = self.length + offset
+      else
+        raise "bad whence #{whence}"
+      end
+
+      @read_point = [0, [@length, new_read_point].min].max
     end
-
   end
 end
 
 class Mystreamo < Vips::Streamou
   def initialize(filename)
-    puts "Mystreamo: initialize"
-
     @filename = filename
     @f = File.open(@filename, "wb")
 
     super()
 
     signal_connect "write" do |buf, len|
-      puts "Mystreami write: #{len} bytes"
-      @f.write(buf)
+      @f.write(buf.get_bytes(0, len))
       len
     end
 
@@ -59,8 +65,8 @@ def initialize(filename)
 
 streamiu = Mystreami.new(ARGV[0])
 image = Vips::Image.new_from_stream(streamiu, "", access: "sequential")
-image.avg
+#puts "avg = #{image.avg}"
 
-#streamio = Mystreamo.new(ARGV[1])
-#image.write_to_stream(streamio, ".png")
+streamio = Mystreamo.new(ARGV[1])
+image.write_to_stream(streamio, ".png")
 
diff --git a/lib/vips/object.rb b/lib/vips/object.rb
@@ -68,34 +68,24 @@ class Progress < FFI::Struct
 
   MARSHAL_READ = lambda do |handler|
     FFI::Function.new(:int64_t, [:pointer, :pointer, :int64_t]) do |i, p, len|
-      puts "MARSHAL_READ handler: #{len} bytes to read"
-      bytes_read = handler.(p, len)
-      puts "  bytes_read = #{bytes_read}"
-
-      bytes_read
+      handler.(p, len)
     end
   end
 
   MARSHAL_SEEK = lambda do |handler|
     FFI::Function.new(:int64_t, [:pointer, :int64_t, :int]) do |i, off, whence|
-      puts "MARSHAL_SEEK handler: off #{off}, whence #{whence}"
-      new_position = handler.(off, whence)
-      puts "  new_position = #{new_position}"
-
-      new_position
+      handler.(off, whence)
     end
   end
 
   MARSHAL_WRITE = lambda do |handler|
     FFI::Function.new(:int64_t, [:pointer, :pointer, :int64_t]) do |i, p, len|
-      puts "MARSHAL_WRITE handler: #{len} bytes to write"
       handler.(p, len)
     end
   end
 
   MARSHAL_FINISH = lambda do |handler|
     FFI::Function.new(:void, [:pointer, :pointer]) do |i, cb|
-      puts "MARSHAL_FINISH handler:"
       handler.()
     end
   end
