contrek 1.1.2 → 1.1.3

data/lib/contrek/finder/node_cluster.rb

@@ -1,7 +1,7 @@
 module Contrek
   module Finder
     class NodeCluster
-      attr_reader :root_nodes, :sequences, :polygons, :lists, :treemap, :vert_nodes
+      attr_reader :root_nodes, :sequences, :polygons, :lists, :treemap, :vert_nodes, :options
       VERSUS_INVERTER = {a: :o, o: :a}
 
       def initialize(h, options)
@@ -44,7 +44,7 @@ module Contrek
       def build_tangs_sequence
         @vert_nodes.each do |line|
           line.each do |node|
-            node.precalc_tangs_sequences
+            node.precalc_tangs_sequences(cluster: self)
           end
         end
       end
@@ -103,9 +103,15 @@ module Contrek
             # end
 
             next_node = if (first.track & Contrek::Finder::Node::OMAX) != 0
-              (inner_v == :a) ? first.tangs[Contrek::Finder::Node::T_UP].first : first.tangs[Contrek::Finder::Node::T_DOWN].first
+              if inner_v == :a
+                vert_nodes[first.y + Node::T_UP][first.upper_start]
+              else
+                vert_nodes[first.y + Node::T_DOWN][first.lower_start]
+              end
+            elsif inner_v == :a
+              vert_nodes[first.y + Node::T_DOWN][first.lower_end]
             else
-              (inner_v == :a) ? first.tangs[Contrek::Finder::Node::T_DOWN].last : first.tangs[Contrek::Finder::Node::T_UP].last
+              vert_nodes[first.y + Node::T_UP][first.upper_end]
             end
 
             if !next_node.nil?
@@ -258,7 +264,7 @@ module Contrek
         plot_node(next_node, start_node, bounds, versus)
       end
 
-      def add_node(node)
+      def add_node(node, offset)
         @nodes += 1
         node.abs_x_index = @vert_nodes[node.y].size
 
@@ -273,17 +279,17 @@ module Contrek
             index = 0
             loop do
               up_node = up_nodes[index]
-              if up_node.max_x >= node.min_x
-                if up_node.min_x <= node.max_x
-                  node.add_intersection(up_node)
-                  up_node.add_intersection(node)
+              if (up_node.max_x + offset) >= node.min_x
+                if (up_node.min_x - offset) <= node.max_x
+                  node.add_intersection(up_node, index)
+                  up_node.add_intersection(node, node.abs_x_index)
                 end
                 return if (index += 1) == up_nodes_count
                 loop do
                   up_node = up_nodes[index]
-                  if up_node.min_x <= node.max_x
-                    node.add_intersection(up_node)
-                    up_node.add_intersection(node)
+                  if (up_node.min_x - offset) <= node.max_x
+                    node.add_intersection(up_node, index)
+                    up_node.add_intersection(node, node.abs_x_index)
                   else
                     return
                   end

data/lib/contrek/finder/polygon_finder.rb

@@ -91,6 +91,7 @@ module Contrek
 
       # image scan
       def scan
+        offset = (@node_cluster.options[:connectivity] == 8) ? 1 : 0
         last_color = nil
         matching = false
         min_x = start_x
@@ -103,16 +104,16 @@ module Contrek
             matching = true
             if x == (end_x - 1)
               max_x = x
-              Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color)
+              Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color, offset)
               matching = false
             end
           elsif @matcher.unmatch?(color) && matching == true
             max_x = x - 1
-            Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color)
+            Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color, offset)
             matching = false
           elsif x == (end_x - 1) && matching == true
             max_x = x
-            Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color)
+            Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color, offset)
             matching = false
           end
         end

data/lib/contrek/version.rb

@@ -1,3 +1,3 @@
 module Contrek
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Emanuele Cesaroni
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-09 00:00:00.000000000 Z
+date: 2026-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -135,12 +135,14 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE-MIT.md
 - LICENSE.md
 - README.md
 - Rakefile
 - contrek.gemspec
 - contrek.png
 - ext/cpp_polygon_finder/PolygonFinder/CMakeLists.txt
+- ext/cpp_polygon_finder/PolygonFinder/LICENSE_AGPL.txt
 - ext/cpp_polygon_finder/PolygonFinder/examples/example.cpp
 - ext/cpp_polygon_finder/PolygonFinder/images/labyrinth.png
 - ext/cpp_polygon_finder/PolygonFinder/images/sample_10240x10240.png
@@ -275,10 +277,9 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://github.com/runout77/contrek
-  source_code_uri: https://github.com/runout77/contrek
   documentation_uri: https://github.com/runout77/contrek#readme
   changelog_uri: https://github.com/runout77/contrek/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -293,8 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Fast PNG contour tracing and shape detection for Ruby
 test_files: []