contrek 1.4.1 → 1.4.2

data/lib/contrek/bitmaps/rgba_bitmap.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "ffi"
+
+module Contrek
+  module Bitmaps
+    class RgbaBitmap < Bitmap
+      BYTES_PER_PIXEL = 4
+
+      def initialize(width, height)
+        @width = width
+        @height = height
+        @raw = FFI::MemoryPointer.new(:uint8, @width * @height * BYTES_PER_PIXEL)
+      end
+
+      def w
+        @width
+      end
+
+      def h
+        @height
+      end
+
+      def get_bytes_per_pixel
+        BYTES_PER_PIXEL
+      end
+
+      def value_at(x, y)
+        rgb_value_at(x, y)
+      end
+
+      def get_row_ptr(y)
+        @raw + (y * @width * BYTES_PER_PIXEL)
+      end
+
+      def rgb_value_at(x, y)
+        index = (y * @width + x) * BYTES_PER_PIXEL
+        r = @raw.get_uint8(index)
+        g = @raw.get_uint8(index + 1)
+        b = @raw.get_uint8(index + 2)
+        a = @raw.get_uint8(index + 3)
+        r | (g << 8) | (b << 16) | (a << 24)
+      end
+
+      def read_bytes(size)
+        @raw.read_bytes(size)
+      end
+    end
+  end
+end

data/lib/contrek/bitmaps/streaming/raster_streamer.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "ffi"
+
+module Contrek
+  module Bitmaps
+    module Streaming
+      class RasterStreamer
+        OVERLAP = 1
+
+        attr_reader :stripe_height
+
+        def initialize(source, stripe_height:)
+          @source = source
+          @stripe_height = stripe_height
+
+          raise ArgumentError, "stripe_height must be greater than 1" if @stripe_height <= OVERLAP
+        end
+
+        def each(buffer)
+          return enum_for(:each, buffer) unless block_given?
+
+          width = @source.width
+          height = @source.height
+          bytes_per_pixel = @source.get_bytes_per_pixel
+
+          row_size = width * bytes_per_pixel
+
+          source_row = 0
+          buffer_rows = 0
+          first_stripe = true
+
+          while source_row < height
+            unless first_stripe
+              previous_last_row = buffer.get_row_ptr(buffer_rows - 1)
+              current_first_row = buffer.get_row_ptr(0)
+              current_first_row.put_bytes(0, previous_last_row.read_bytes(row_size))
+            end
+
+            overlap_rows = first_stripe ? 0 : OVERLAP
+            available_rows = @stripe_height - overlap_rows
+            remaining_rows = height - source_row
+            rows_to_read = [available_rows, remaining_rows].min
+
+            rows_read = 0
+            rows_to_read.times do |i|
+              buffer_y = overlap_rows + i
+              row_ptr = buffer.get_row_ptr(buffer_y)
+              break unless @source.read_next_row(row_ptr, row_size)
+
+              source_row += 1
+              rows_read += 1
+            end
+
+            buffer_rows = overlap_rows + rows_read
+            break if buffer_rows == 0
+
+            yield buffer, buffer_rows, buffer_rows * row_size
+
+            first_stripe = false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/contrek/bitmaps/streaming/sources/ascii.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Contrek
+  module Bitmaps
+    module Streaming
+      module Sources
+        class Ascii < Base
+          extend Forwardable
+
+          def_delegator :@bitmap, :w, :width
+          def_delegator :@bitmap, :h, :height
+          def_delegators :@bitmap, :get_bytes_per_pixel
+
+          def initialize(bitmap)
+            @current_row = 0
+            @bitmap = bitmap
+          end
+
+          def read_next_row(destination, row_size)
+            return false if @current_row >= height
+
+            row = @bitmap.get_row_ptr(@current_row)
+            destination.put_bytes(0, row.read_bytes(row_size))
+            @current_row += 1
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/contrek/bitmaps/streaming/sources/base.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Contrek
+  module Bitmaps
+    module Streaming
+      module Sources
+        class Base
+          def width
+            raise NotImplementedError
+          end
+
+          def height
+            raise NotImplementedError
+          end
+
+          def get_bytes_per_pixel
+            raise NotImplementedError
+          end
+
+          def read_next_row(destination, row_size)
+            raise NotImplementedError
+          end
+        end
+      end
+    end
+  end
+end

data/lib/contrek/bitmaps/streaming/sources/png.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require "ffi"
+require "cpp_polygon_finder"
+
+module Contrek
+  module Bitmaps
+    module Streaming
+      module Sources
+        class Png
+          attr_reader :width, :height
+
+          module LibSpng
+            extend FFI::Library
+
+            ffi_lib FFI::Library::CURRENT_PROCESS
+
+            SPNG_FMT_RGBA8 = 1
+            SPNG_DECODE_PROGRESSIVE = 256
+            SPNG_EOI = 75
+
+            class Ihdr < FFI::Struct
+              layout(
+                :width, :uint32,
+                :height, :uint32,
+                :bit_depth, :uint8,
+                :color_type, :uint8,
+                :compression_method, :uint8,
+                :filter_method, :uint8,
+                :interlace_method, :uint8
+              )
+            end
+
+            attach_function :spng_ctx_new, [:int], :pointer
+            attach_function :spng_ctx_free, [:pointer], :void
+            attach_function :spng_set_png_file, [:pointer, :pointer], :int
+            attach_function :spng_get_ihdr, [:pointer, :pointer], :int
+            attach_function :spng_decode_image, [:pointer, :pointer, :size_t, :int, :int], :int
+            attach_function :spng_decode_row, [:pointer, :pointer, :size_t], :int
+          end
+
+          module LibC
+            extend FFI::Library
+
+            ffi_lib FFI::Library::LIBC
+
+            attach_function :fopen, [:string, :string], :pointer
+            attach_function :fclose, [:pointer], :int
+          end
+
+          def initialize(filepath)
+            @fp = LibC.fopen(filepath, "rb")
+            raise "Unable to open PNG: #{filepath}" if @fp.null?
+
+            @ctx = LibSpng.spng_ctx_new(0)
+            raise "Unable to create spng context" if @ctx.null?
+
+            ret = LibSpng.spng_set_png_file(@ctx, @fp)
+            raise "spng_set_png_file failed: #{ret}" unless ret == 0
+
+            ihdr = LibSpng::Ihdr.new
+
+            ret = LibSpng.spng_get_ihdr(@ctx, ihdr)
+            raise "spng_get_ihdr failed: #{ret}" unless ret == 0
+
+            @width = ihdr[:width]
+            @height = ihdr[:height]
+
+            ret = LibSpng.spng_decode_image(
+              @ctx,
+              nil,
+              0,
+              LibSpng::SPNG_FMT_RGBA8,
+              LibSpng::SPNG_DECODE_PROGRESSIVE
+            )
+            raise "Unable to initialize progressive decoding: #{ret}" unless ret == 0
+          end
+
+          def get_bytes_per_pixel
+            4
+          end
+
+          def read_next_row(destination, row_size)
+            ret = LibSpng.spng_decode_row(@ctx, destination, row_size)
+            unless ret == 0 || ret == LibSpng::SPNG_EOI
+              raise "spng_decode_row failed: #{ret}"
+            end
+            true
+          end
+
+          def close
+            unless @ctx.nil? || @ctx.null?
+              LibSpng.spng_ctx_free(@ctx)
+              @ctx = nil
+            end
+            unless @fp.nil? || @fp.null?
+              LibC.fclose(@fp)
+              @fp = nil
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/contrek/finder/concurrent/finder.rb

@@ -30,7 +30,7 @@ module Contrek
           @options = options
           @clusters = []
           @maximum_width = bitmap.w
-          @height = bitmap.h
+          @height = options[:processing_height] || bitmap.h
           @number_of_tiles = options[:number_of_tiles] || (raise "number_of_tiles params is needed!")
           @number_of_tiles = 1 if @number_of_tiles <= 0
 
@@ -51,6 +51,7 @@ module Contrek
                 bitmap: bitmap,
                 matcher: matcher,
                 options: {
+                  processing_height: @options[:processing_height],
                   versus: current_versus,
                   bounds: true,
                   treemap: @options[:treemap],
@@ -71,7 +72,7 @@ module Contrek
 
             x = tile_end_x - 1
           end
-          process_tiles!(bitmap, height: bitmap.h, deterministic: @options[:deterministic])
+          process_tiles!(bitmap, height: @height, deterministic: @options[:deterministic])
         end.real
       end
 

data/lib/contrek/finder/polygon_finder.rb

@@ -10,10 +10,13 @@ module Contrek
         @options = {versus: :a}.merge(options)
         sanitize_options
         @source_bitmap = bitmap
+        @processing_height = (options[:processing_height] || bitmap.h).abs
+        raise ArgumentError, "Option processing_height must be less or equal than image height!" if @processing_height > bitmap.h
+
         @matcher = matcher
 
         @test_bitmap = test_bitmap
-        @node_cluster = NodeCluster.new(@source_bitmap.h, @options)
+        @node_cluster = NodeCluster.new(@processing_height, @options)
         @reports = {}
 
         # 1 finds matching blocks
@@ -51,7 +54,7 @@ module Contrek
           groups_names: @node_cluster.root_nodes.map(&:name).join,
           benchmarks: format_benchmarks,
           width: @source_bitmap.w,
-          height: @source_bitmap.h,
+          height: @processing_height,
           treemap: (@node_cluster.treemap if @options.has_key?(:treemap)),
           options: @ori_options,
           versus: @options[:versus],
@@ -103,7 +106,7 @@ module Contrek
         matching = false
         min_x = start_x
         max_x = start_x
-        @source_bitmap.scan(start_x: start_x, end_x: end_x) do |x, y, color|
+        @source_bitmap.scan(start_x: start_x, end_x: end_x, end_y: @processing_height) do |x, y, color|
           # puts "#{x} #{y}"
           if @matcher.match?(color) && matching == false
             min_x = x

data/lib/contrek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Contrek
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/lib/contrek.rb

@@ -5,11 +5,16 @@ require "contrek/bitmaps/painting"
 require "contrek/bitmaps/rendering"
 require "contrek/bitmaps/bitmap"
 require "contrek/bitmaps/chunky_bitmap"
+require "contrek/bitmaps/rgba_bitmap"
 require "contrek/bitmaps/png_bitmap"
 require "contrek/bitmaps/raw_bitmap"
 require "contrek/bitmaps/rgb_color"
 require "contrek/bitmaps/rgb_cpp_color"
 require "contrek/bitmaps/sample_generator"
+require "contrek/bitmaps/streaming/raster_streamer"
+require "contrek/bitmaps/streaming/sources/base"
+require "contrek/bitmaps/streaming/sources/ascii"
+require "contrek/bitmaps/streaming/sources/png"
 require "contrek/shared/result"
 require "contrek/finder/bounds"
 require "contrek/finder/list"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Emanuele Cesaroni
@@ -99,6 +99,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,12 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/RemoteFastPngBitmap.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/spng.c
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/spng.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/streaming/AsciiSource.cpp
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/streaming/AsciiSource.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/streaming/PngSource.cpp
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/streaming/PngSource.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/streaming/RasterSource.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/streaming/RasterStreamer.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/FinderUtils.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/FinderUtils.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/List.cpp
@@ -252,7 +272,12 @@ files:
 - lib/contrek/bitmaps/rendering.rb
 - lib/contrek/bitmaps/rgb_color.rb
 - lib/contrek/bitmaps/rgb_cpp_color.rb
+- lib/contrek/bitmaps/rgba_bitmap.rb
 - lib/contrek/bitmaps/sample_generator.rb
+- lib/contrek/bitmaps/streaming/raster_streamer.rb
+- lib/contrek/bitmaps/streaming/sources/ascii.rb
+- lib/contrek/bitmaps/streaming/sources/base.rb
+- lib/contrek/bitmaps/streaming/sources/png.rb
 - lib/contrek/cpp/cpp_concurrent_finder.rb
 - lib/contrek/cpp/cpp_concurrent_horizontal_merger.rb
 - lib/contrek/cpp/cpp_concurrent_merger.rb