contrek 1.4.0 → 1.4.2

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,10 +54,11 @@ 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]
+          versus: @options[:versus],
+          number_of_threads: 0
         }
         Result.new(@node_cluster.polygons, metadata)
       end
@@ -102,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.0"
+  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.0
+  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