contrek 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0c4f7e37692b2d2e5b17556ed67bee4b624511ddf1dc3865ecf910e8f46aeb
-  data.tar.gz: 66b9af71020dc6a86da1abace1d0467807b9212e207b71a7f6337b2257a34192
+  metadata.gz: ae46fa52ddce3383ef534142814ed28ddc5cae45042e677c8f445140bee67e82
+  data.tar.gz: 57cbaf53a0d6e8c7d31bdfcef0718c94654ceaf0fd7b2be84325751dc29f6224
 SHA512:
-  metadata.gz: 63ba135c86c7849fda12e542af23a2746681f8aade888daa9269438c1601e8184215b3fe5081ee9caabce923e7dfafd8bcc3613fb06cf2ec9997193ff831e5c7
-  data.tar.gz: dd691e542a8722be9532d3c0f206d4b2a2499874f0be52786c99822036d3e0e463ffb6d301bceae44e8f487f434eeff98c9a931cffe27eab3ed5d249daf060e5
+  metadata.gz: ee922b6b787ac0f91b98a2e7d608c351499ea5405e325a0eb6d23f751a29075b390c08d757824132c7fbef7d64cef9f3af7dbb11709506e84777ff652f9f15fc
+  data.tar.gz: 848102a6980857b1f4d3914e60de04408d0f7a4cc4c950a20b3fa8ef7231e31db029220eb6e3fb71847b6986a09c0d7b1fedae70f8e30e8ef758a3adeabeddcd

data/CHANGELOG.md

@@ -112,3 +112,7 @@ All notable changes to this project will be documented in this file.
 - **Refactored `spng.c` function `rgb8_row_to_rgba8`:** Extended a loop counter to `size_t` (previously limited to `uint32_t`), which was causing segmentation faults when reading massive images (e.g., 81920x81920).
 - **Refactored `RawBitmap.define` function:** Updated area and size calculations to use full 64-bit integers.
 - **Refactored `PolygonFinder.to_svg_stream()` function:** Optimized performance to efficiently handle massive SVG streams of 2 GB and beyond.
+
+## [1.2.7] - 2026-06-02
+### Changed
+- **Refactored `bounds` option:** Starting from this release, precalculated bounds for each polygon can now be requested in concurrent mode as well, in addition to single-threaded mode.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    contrek (1.2.6)
+    contrek (1.2.7)
       chunky_png (~> 1.4)
       concurrent-ruby (~> 1.3.5)
       rice (= 4.5.0)

data/README.md

@@ -286,6 +286,18 @@ result.points
 For pure Ruby implementations (`{ native: false }`), coordinates are always expressed as points.  
 In this case, both `polygons` and `points` return the same data, represented as hashes with `x` and `y` keys.
 
+For each returned polygon, it is possible to get its bounding box. You just need to request it as an option (`bounds`), for example:
+```ruby
+{named_sequences: true, bounds: true, compress: {uniq: true, linear: true}}
+```
+Each entry will contain the precalculated bounds key:
+```ruby
+[{:bounds=>{:min_x=>3, :max_x=>11, :min_y=>1, :max_y=>3},
+  :outer=>[{:x=>3, :y=>1}, {:x=>3, :y=>3}, {:x=>11, :y=>3}, {:x=>11, :y=>1}],
+  :inner=>[]}]
+```
+
+
 ## Metadata
 
 Metadata associated with the result can be accessed via:

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/FinderUtils.cpp

@@ -108,12 +108,13 @@ void FinderUtils::sanitize_options(pf_Options& options, std::vector<std::string>
       break;
     }
   }
-  /*std::cout << "-----------" << std::endl;
+  /* std::cout << "-----------" << std::endl;
   std::cout << "versus " << options.versus << std::endl;
+  std::cout << "bounds " << options.bounds << std::endl;
   std::cout << "number_of_tiles " << options.number_of_tiles << std::endl;
   std::cout << "uniq " << options.compress_uniq << std::endl;
   std::cout << "linear " << options.compress_linear << std::endl;
   std::cout << "visvalingam " << options.compress_visvalingam << std::endl;
-  std::cout << options.compress_visvalingam_tolerance << std::endl;
-  std::cout << "-----------" << std::endl;*/
+  std::cout << "visvalingam tolernace " << options.compress_visvalingam_tolerance << std::endl;
+  std::cout << "-----------" << std::endl; */
 }

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/PolygonFinder.cpp

@@ -107,6 +107,7 @@ ProcessResult* PolygonFinder::process_info() {
   pr->treemap = this->node_cluster->treemap;
   pr->width = this->source_bitmap->w();
   pr->height = this->source_bitmap->h();
+  pr->has_bounds = this->node_cluster->options->bounds;
 
   if (this->node_cluster->options->named_sequences && typeid(*this->source_bitmap) == typeid(Bitmap))
   { std::string sequence;

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/PolygonFinder.h

@@ -59,6 +59,7 @@ struct pf_Options {
 struct ProcessResult {
   int groups;
   int width, height;
+  bool has_bounds = false;
   std::map<std::string, double> benchmarks;
   std::list<Polygon> polygons;
   std::string named_sequence;

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Finder.cpp

@@ -60,7 +60,7 @@ Finder::Finder(int number_of_threads, Bitmap *bitmap, Matcher *matcher, std::vec
       Tile* tile = new Tile(this, payload.tile_start_x, payload.tile_end_x,
                             std::to_string(payload.tile_index), Benchmarks {0, 0});
       tile->initial_process(finder);
-      tiles.queue_push(tile);
+      tiles_.queue_push(tile);
     });
 
     x = tile_end_x - 1;
@@ -79,7 +79,7 @@ void Finder::process_tiles() {
   std::vector<Tile*> arriving_tiles;
 
   while (true) {
-    Tile* tile = tiles.queue_pop();
+    Tile* tile = tiles_.queue_pop();
 
     if (tile->whole()) {
       this->whole_tile = tile;
@@ -116,7 +116,7 @@ void Finder::process_tiles() {
       arriving_tiles.erase(it);
       enqueue(cluster, [this](Cluster* c) {
         Tile* merged_tile = c->merge_tiles();
-        tiles.queue_push(merged_tile);
+        tiles_.queue_push(merged_tile);
         delete c;
       });
     } else {
@@ -146,6 +146,7 @@ ProcessResult* Finder::process_info() {
   pr->groups = pr->polygons.size();
   pr->width = this->maximum_width_;
   pr->height = this->height;
+  pr->has_bounds = this->options_.bounds;
   FakeCluster fake_cluster(pr->polygons, this->options_);
   cpu_timer.start();
   fake_cluster.compress_coords(pr->polygons, this->options_);

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Finder.h

@@ -42,7 +42,7 @@ class Finder : public Poolable {
   CpuTimer cpu_timer;
 
  protected:
-  Queue<Tile*> tiles;
+  Queue<Tile*> tiles_;
   int maximum_width_;
   int height = 0;
   void process_tiles();
@@ -55,4 +55,5 @@ class Finder : public Poolable {
   int maximum_width() const { return maximum_width_; }
   virtual ProcessResult* process_info();
   const pf_Options& options() const { return options_; }
+  Queue<Tile*>& tiles() { return tiles_; }
 };

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Merger.cpp

@@ -21,9 +21,9 @@ void Merger::add_tile(ProcessResult& result)
     this->height = result.height;
   }
   int end_x = this->current_x + result.width;
-  Tile* tile = new Tile(this, this->current_x, end_x, std::to_string(tiles.size()), Benchmarks {0, 0});
+  Tile* tile = new Tile(this, this->current_x, end_x, std::to_string(tiles_.size()), Benchmarks {0, 0});
   tile->assign_raw_polygons(result.polygons, result.treemap);
-  tiles.queue_push(tile);
+  tiles_.queue_push(tile);
 
   this->maximum_width_ = end_x;
   this->current_x = end_x - 1;

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Polyline.cpp

@@ -95,3 +95,10 @@ std::string Polyline::named() {
     return this->named_;
   }
 }
+
+void Polyline::fill_bounds(RectBounds& target_bounds) const {
+  target_bounds.min_x = this->min_x;
+  target_bounds.max_x = this->max_x;
+  target_bounds.min_y = this->min_y_;
+  target_bounds.max_y = this->max_y_;
+}

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Polyline.h

@@ -52,6 +52,7 @@ class Polyline : public Partitionable {
   InnerPolyline* inside_inner_polyline = nullptr;
   std::string named();
   void set_named(std::string force_named) { this->named_ = force_named; }
+  void fill_bounds(RectBounds& target_bounds) const;
 
  private:
   std::vector<Point*> raw_;

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Tile.cpp

@@ -107,10 +107,14 @@ std::string Tile::toString() {
 
 std::list<Polygon> Tile::to_raw_polygons()
 { std::list<Polygon> retme;
+  bool bounds = this->finder->options().bounds;
   for (Shape* s : shapes_)
   { if (s->outer_polyline && !s->outer_polyline->is_empty())
     { Polygon poly;
       poly.outer = s->outer_polyline->raw();
+      if (bounds) {
+        s->outer_polyline->fill_bounds(poly.bounds);
+      }
       if (!s->inner_polylines.empty()) {
         for (auto inner : s->inner_polylines) {
           poly.inner.push_back(inner->raw());

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/VerticalMerger.cpp

@@ -21,7 +21,7 @@ VerticalMerger::VerticalMerger(int number_of_threads, std::vector<std::string> *
 
 void VerticalMerger::add_tile(ProcessResult& result)
 { transpose(result);
-  if (this->tiles.size() > 0) {
+  if (this->tiles_.size() > 0) {
     translate(result, this->current_x);
   }
   adjust(result);

data/ext/cpp_polygon_finder/cpp_polygon_finder.cpp

@@ -172,6 +172,7 @@ class To_Ruby<ProcessResult*>
     }
     RubyResult* rr = new RubyResult();
     Rice::Data_Object<RubyResult> rb_result(rr);
+    bool inject_bounds = pr->has_bounds;
 
     Rice::Hash return_me = Rice::Hash();
     Rice::Hash benchmarks_rb;
@@ -206,12 +207,14 @@ class To_Ruby<ProcessResult*>
       }
       poly_hash[Symbol("inner")] = inner_collection;
       // BOUNDS
-      Rice::Hash bounds_hash = Rice::Hash();
-      bounds_hash[Symbol("min_x")] = x.bounds.min_x;
-      bounds_hash[Symbol("max_x")] = x.bounds.max_x;
-      bounds_hash[Symbol("min_y")] = x.bounds.min_y;
-      bounds_hash[Symbol("max_y")] = x.bounds.max_y;
-      poly_hash[Symbol("bounds")] = bounds_hash;
+      if (inject_bounds) {
+        Rice::Hash bounds_hash = Rice::Hash();
+        bounds_hash[Symbol("min_x")] = x.bounds.min_x;
+        bounds_hash[Symbol("max_x")] = x.bounds.max_x;
+        bounds_hash[Symbol("min_y")] = x.bounds.min_y;
+        bounds_hash[Symbol("max_y")] = x.bounds.max_y;
+        poly_hash[Symbol("bounds")] = bounds_hash;
+      }
 
       out.push(poly_hash);
     }

data/lib/contrek/cpp/cpp_result.rb

@@ -19,8 +19,9 @@ module Contrek
       def points
         raw_list = polygons.to_a
         @to_points ||= raw_list.map do |polygon|
-          {outer: self.class.to_points(polygon[:outer]),
-           inner: polygon[:inner].map { |s| self.class.to_points(s) }}
+          {bounds: (polygon[:bounds] if polygon.key?(:bounds)),
+           outer: self.class.to_points(polygon[:outer]),
+           inner: polygon[:inner].map { |s| self.class.to_points(s) }}.compact
         end
       end
 

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

@@ -54,8 +54,9 @@ module Contrek
       def to_raw_polygons
         @shapes.filter_map do |shape|
           unless shape.outer_polyline.empty?
-            {outer: shape.outer_polyline.raw,
-             inner: shape.inner_polylines.map(&:raw)}
+            {bounds: (shape.outer_polyline.get_bounds if @finder.options[:bounds]),
+             outer: shape.outer_polyline.raw,
+             inner: shape.inner_polylines.map(&:raw)}.compact
           end
         end
       end

data/lib/contrek/version.rb

@@ -1,3 +1,3 @@
 module Contrek
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-05-31 00:00:00.000000000 Z
+date: 2026-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec