contrek 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d4e8a9a3c94ae345edb0ecbb6087020141ad20cd2661e2b58578323a721f66e
-  data.tar.gz: ec99c9629d41d589e90ff39d8305c7e0355743b3f51caeb1e0a9da4702007fde
+  metadata.gz: 07f6097c256b6d44373aa941b969b12dd68630e168c72b29d1ae478bb5f48186
+  data.tar.gz: 7ec31b1ef4413e679e31a123f367d0a86ed332160455c8024ea185ca67c27020
 SHA512:
-  metadata.gz: 9180029576fc846f3cbc8adcd68e5f68374b49fb734db8352e9ced637a447cfad93beb37cb5206084b411f4cb5cc26de9a1ac075b09f8ce1b39bb6e33fadd018
-  data.tar.gz: 163a00611440eb83d538b4dcd3f3c36745350c1d34e657fcdae069dd8c8020f36eec005264bd581e2024fca772e7f53dc0f856d35eca4717b741b0bcbaa91e5a
+  metadata.gz: c03213b7499e5741bf3c90044251a5ba6fc606905f3c72ff93462a62ffc116ebae7ce211fb2a201862d874ae865df048e45cf85beed094bc60967d2b4dd6fc34
+  data.tar.gz: ae891e55d9d9ef5503f654d79c7187713579c6fa1c699736d446d6b19497ddb9d30723a26e98a77261481f364466b7d891962e9937433a65e6e341f240129faa

data/CHANGELOG.md

@@ -91,4 +91,11 @@ All notable changes to this project will be documented in this file.
 
 ## [1.2.2] - 2026-05-20
 ### Changed
-- The treemap determination algorithm has been heavily optimized. Calls to the geometric routine that checks whether a newly generated inner polyline encloses other already-existing ones have been reduced to the minimum. Polylines adjacent to the shared overlap stripe are now excluded from these checks, as they are already identified during the initial polygon detection phase. The geometric approach remains unavoidable in this context and is still a performance bottleneck. It will certainly be the subject of future optimizations.
+- The treemap determination algorithm has been heavily optimized. Calls to the geometric routine that checks whether a newly generated inner polyline encloses other already-existing ones have been reduced to the minimum. Polylines adjacent to the shared overlap stripe are now excluded from these checks, as they are already identified during the initial polygon detection phase. The geometric approach remains unavoidable in this context and is still a performance bottleneck. It will certainly be the subject of future optimizations.
+
+## [1.2.3] - 2026-05-23
+### Changed
+### Changed
+* **SVG Conversion:** Added utility methods to convert point coordinates directly into SVG paths.
+* **Contrek API & RAII Architecture:** Refactored the Contrek API to utilize an RAII (Resource Acquisition Is Initialization) pattern, safely wrapping both the trace engine and the processing results within a unified context lifecycle shell.
+* **ProcessResult Memory Management:** Updated `ProcessResult` to properly manage resource deallocation during cloning operations, ensuring deep-copied or moved internal points are automatically and safely freed when the context scope ends.

data/Gemfile.lock

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

data/contrek.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/runout77/contrek"
   s.licenses = ["MIT", "AGPL-3.0-only"]
   s.files = Dir.chdir(File.expand_path("..", __FILE__)) do
-    `git ls-files -z`.split("\x0").reject do |f| 
-      f.match(%r{^(docs|pkg|spec)/}) || 
-      f.include?("PolygonFinder/images/") || 
-      f.include?("PolygonFinder/examples/")
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(docs|pkg|spec)/}) ||
+        f.include?("PolygonFinder/images/") ||
+        f.include?("PolygonFinder/examples/")
     end
   end
   s.metadata = {

data/ext/cpp_polygon_finder/PolygonFinder/src/ContrekApi.h

@@ -13,6 +13,7 @@
 #include <vector>
 #include <memory>
 #include <cstdint>
+#include <string_view>
 
 #include "Finder.h"
 #include "FastPngBitmap.h"
@@ -43,21 +44,44 @@ struct Config {
   Connectivity connectivity_mode = Connectivity::ORTHOGONAL;
 };
 
-inline std::unique_ptr<ProcessResult> trace(const std::string& image_path, const Config& cfg = Config()) {
-  auto bitmap = std::make_unique<FastPngBitmap>(image_path);
+struct TraceContext {
+  std::unique_ptr<FastPngBitmap> bitmap;
+  std::unique_ptr<Matcher> matcher;
+  std::vector<std::string> internal_args;
+  std::unique_ptr<Finder> finder;
+  std::unique_ptr<ProcessResult> result;
+
+  // this allows result direct access
+  const ProcessResult* operator->() const { return result.get(); }
+  ProcessResult* operator->() { return result.get(); }
+  const ProcessResult& operator*() const { return *result; }
+  ProcessResult& operator*() { return *result; }
+
+  // context can be moved not copied
+  TraceContext() = default;
+  TraceContext(const TraceContext&) = delete;
+  TraceContext& operator=(const TraceContext&) = delete;
+  TraceContext(TraceContext&&) = default;
+  TraceContext& operator=(TraceContext&&) = default;
+};
+
+inline TraceContext trace(const std::string& image_path, const Config& cfg = Config()) {
+  TraceContext ctx;
+
+  ctx.bitmap = std::make_unique<FastPngBitmap>(image_path);
 
   int32_t color_to_match = (cfg.target_color == -1)
-                           ? bitmap->rgb_value_at(0, 0)
-                           : cfg.target_color;
+                             ? ctx.bitmap->rgb_value_at(0, 0)
+                             : cfg.target_color;
 
-  std::unique_ptr<Matcher> matcher;
   if (cfg.mode == MatchMode::NOT_COLOR) {
-    matcher = std::make_unique<RGBNotMatcher>(color_to_match);
+    ctx.matcher = std::make_unique<RGBNotMatcher>(color_to_match);
   } else {
-    matcher = std::make_unique<RGBMatcher>(color_to_match);
+    ctx.matcher = std::make_unique<RGBMatcher>(color_to_match);
   }
 
-  std::vector<std::string> internal_args = {"--versus=a"};
+  ctx.internal_args = {"--versus=a"};
+
   struct Mapping { bool flag; std::string_view arg; };
   const Mapping mappings[] = {
     {cfg.compress_unique,      "--compress_uniq"},
@@ -65,18 +89,17 @@ inline std::unique_ptr<ProcessResult> trace(const std::string& image_path, const
     {cfg.compress_visvalingam, "--compress_visvalingam"},
     {cfg.treemap,              "--treemap"}
   };
-
-  for (auto& m : mappings) {
-      if (m.flag) internal_args.emplace_back(m.arg);
+  for (const auto& m : mappings) {
+    if (m.flag) ctx.internal_args.emplace_back(m.arg);
   }
-  internal_args.push_back("--number_of_tiles=" + std::to_string(cfg.tiles));
+  ctx.internal_args.push_back("--number_of_tiles=" + std::to_string(cfg.tiles));
   if (cfg.connectivity_mode == Connectivity::OMNIDIRECTIONAL) {
-    internal_args.push_back("--connectivity=" + std::to_string(8));
+    ctx.internal_args.push_back("--connectivity=" + std::to_string(8));
   }
+  ctx.finder = std::make_unique<Finder>(cfg.threads, ctx.bitmap.get(), ctx.matcher.get(), &ctx.internal_args);
+  ctx.result = std::unique_ptr<ProcessResult>(ctx.finder->process_info());
 
-  Finder finder(cfg.threads, bitmap.get(), matcher.get(), &internal_args);
-
-  return std::unique_ptr<ProcessResult>(finder.process_info());
+  return ctx;
 }
 
 }  // namespace Contrek

data/ext/cpp_polygon_finder/PolygonFinder/src/Tests.cpp

@@ -342,17 +342,18 @@ void stream_png_image(const std::string& filepath, uint32_t stripe_height) {
 
     std::cout << "Merging polygons ..." << std::endl;
     ProcessResult *merged_result = vmerger.process_info();
-    std::cout << "Founds total polygons: " << merged_result->groups << std::endl;
 
     if (merged_result) {
-      RawBitmap full_bitmap;
+      std::cout << "Founds total polygons: " << merged_result->groups << std::endl;
+      /*RawBitmap full_bitmap;
       full_bitmap.define(total_width, total_height, 4, true);
       full_bitmap.fill(255, 255, 255);
       merged_result->draw_on_bitmap(full_bitmap);
       std::cout << "Saving whole png ..." << std::endl;
       if (full_bitmap.save_to_png("whole.png")) {
         std::cout << "Png saved!" << std::endl;
-      }
+      }*/
+      merged_result->save_svg("whole.svg");
     }
     delete merged_result;
     // frees memory

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

@@ -14,7 +14,12 @@
 #include <string>
 #include <map>
 #include <iostream>
+#include <memory>
 #include <utility>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+#include <limits>
 #include "../bitmaps/Bitmap.h"
 #include "NodeCluster.h"
 #include "Node.h"
@@ -58,6 +63,8 @@ struct ProcessResult {
   std::list<Polygon> polygons;
   std::string named_sequence;
   std::vector<std::pair<int, int>> treemap;
+  std::vector<std::unique_ptr<Point>> cloned_points_storage;
+
   void draw_on_bitmap(RawBitmap& canvas) const;
 
   void print_polygons() {
@@ -103,14 +110,22 @@ struct ProcessResult {
     new_res->named_sequence = this->named_sequence;
     new_res->treemap = this->treemap;
 
+    size_t estimated_points = 0;
+    for (const auto& poly : this->polygons) {
+      estimated_points += poly.outer.size();
+      for (const auto& seq : poly.inner) estimated_points += seq.size();
+    }
+    new_res->cloned_points_storage.reserve(estimated_points);
+
     for (const auto& poly : this->polygons) {
       Polygon new_poly;
-      // Bounds
+      // bounds
       new_poly.bounds = poly.bounds;
       // outer
       for (const Point* p : poly.outer) {
         if (p) {
-          new_poly.outer.push_back(new Point(p->x, p->y));
+          new_res->cloned_points_storage.push_back(std::make_unique<Point>(p->x, p->y));
+          new_poly.outer.push_back(new_res->cloned_points_storage.back().get());
         }
       }
       // inner
@@ -118,7 +133,8 @@ struct ProcessResult {
         std::vector<Point*> new_seq;
         for (const Point* p : seq) {
           if (p) {
-            new_seq.push_back(new Point(p->x, p->y));
+            new_res->cloned_points_storage.push_back(std::make_unique<Point>(p->x, p->y));
+            new_seq.push_back(new_res->cloned_points_storage.back().get());
           }
         }
         new_poly.inner.push_back(new_seq);
@@ -127,6 +143,61 @@ struct ProcessResult {
     }
     return new_res;
   }
+
+  std::string to_svg() const {
+    std::vector<std::string> lines;
+    lines.push_back(
+      "<svg xmlns=\"http://www.w3.org/2000/svg\" "
+      "width=\"" + std::to_string(width) +
+      "\" height=\"" + std::to_string(height) + "\">");
+    for (const auto& poly : polygons) {
+      { // outer
+        std::ostringstream pts;
+        bool first = true;
+        for (const Point* p : poly.outer) {
+          if (!p) continue;
+          if (!first)
+              pts << " ";
+          first = false;
+          pts << p->x << "," << p->y;
+        }
+        lines.push_back(
+          "<polygon points=\"" + pts.str() +
+          "\" fill=\"none\" stroke=\"red\" stroke-width=\"1\"/>");
+      }
+      // inner
+      for (const auto& sequence : poly.inner) {
+        if (sequence.empty()) continue;
+        std::ostringstream pts;
+        bool first = true;
+        for (const Point* p : sequence) {
+          if (!p) continue;
+          if (!first) pts << " ";
+          first = false;
+          pts << p->x << "," << p->y;
+        }
+        lines.push_back(
+          "<polygon points=\"" + pts.str() +
+          "\" fill=\"none\" stroke=\"green\" stroke-width=\"1\"/>");
+      }
+    }
+    lines.push_back("</svg>");
+    std::ostringstream result;
+    for (size_t i = 0; i < lines.size(); ++i) {
+      result << lines[i];
+      if (i + 1 < lines.size()) result << "\n";
+    }
+    return result.str();
+  }
+
+  void save_svg(const std::string& filename) const {
+    std::ofstream file(filename);
+    if (!file.is_open()) {
+      throw std::runtime_error("Unable to open SVG file: " + filename);
+    }
+    file << to_svg();
+    file.close();
+  }
 };
 
 class PolygonFinder {

data/lib/contrek/cpp/cpp_result.rb

@@ -1,6 +1,8 @@
 module Contrek
   module Cpp
     class CPPResult
+      include Shared::Result
+
       def polygons=(list)
         @polygons_storage = list
       end

data/lib/contrek/finder/result.rb

@@ -1,6 +1,8 @@
 module Contrek
   module Finder
     Result = Struct.new(:polygons, :metadata) do
+      include Shared::Result
+
       def points
         polygons
       end

data/lib/contrek/shared/result.rb

@@ -0,0 +1,23 @@
+module Contrek
+  module Shared
+    module Result
+      def to_svg
+        width = metadata[:width]
+        height = metadata[:height]
+        lines = []
+        lines << %(<svg xmlns="http://www.w3.org/2000/svg" width="#{width}" height="#{height}">)
+        points.each do |poly|
+          pts = poly[:outer].map { |p| "#{p[:x]},#{p[:y]}" }.join(" ")
+          lines << %(<polygon points="#{pts}" fill="none" stroke="red" stroke-width="1"/>)
+          poly[:inner].each do |sequence|
+            next if sequence.empty?
+            pts = sequence.map { |p| "#{p[:x]},#{p[:y]}" }.join(" ")
+            lines << %(<polygon points="#{pts}" fill="none" stroke="green" stroke-width="1"/>)
+          end
+        end
+        lines << "</svg>"
+        lines.join("\n")
+      end
+    end
+  end
+end

data/lib/contrek/version.rb

@@ -1,3 +1,3 @@
 module Contrek
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/lib/contrek.rb

@@ -6,8 +6,9 @@ require "contrek/bitmaps/png_bitmap"
 require "contrek/bitmaps/raw_bitmap"
 require "contrek/bitmaps/rgb_color"
 require "contrek/bitmaps/rgb_cpp_color"
-require "contrek/finder/bounds"
 require "contrek/bitmaps/sample_generator"
+require "contrek/shared/result"
+require "contrek/finder/bounds"
 require "contrek/finder/list"
 require "contrek/finder/list_entry"
 require "contrek/finder/listable"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-05-20 00:00:00.000000000 Z
+date: 2026-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -291,6 +291,7 @@ files:
 - lib/contrek/reducers/reducer.rb
 - lib/contrek/reducers/uniq_reducer.rb
 - lib/contrek/reducers/visvalingam_reducer.rb
+- lib/contrek/shared/result.rb
 - lib/contrek/version.rb
 homepage: https://github.com/runout77/contrek
 licenses: