contrek 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32d1d662c0c6c0c1dc6ffcde36090b188e7d3abd39fc5dd7ba0887aa62526b27
-  data.tar.gz: df8b75836abf466043587f22995f12e13c3ed908b60a4fcda97216e803458540
+  metadata.gz: ca0c4f7e37692b2d2e5b17556ed67bee4b624511ddf1dc3865ecf910e8f46aeb
+  data.tar.gz: 66b9af71020dc6a86da1abace1d0467807b9212e207b71a7f6337b2257a34192
 SHA512:
-  metadata.gz: 33c9e4906109bcd7cee694401b3946b0fe2e5800c551bc20a4ea428bdb7cbe7eb456a2e7cadd57327ca93bf65491284e4566b2caaa9e0ea28a5c771c8e50510b
-  data.tar.gz: ede6984f06ebef2b9672e1f1c0569428b25332e9bb14249a8341fdc1e4f11c493a066015a496bd9d19baec57a97bf98d4d99d23262a4a7dac93757c129e8c441
+  metadata.gz: 63ba135c86c7849fda12e542af23a2746681f8aade888daa9269438c1601e8184215b3fe5081ee9caabce923e7dfafd8bcc3613fb06cf2ec9997193ff831e5c7
+  data.tar.gz: dd691e542a8722be9532d3c0f206d4b2a2499874f0be52786c99822036d3e0e463ffb6d301bceae44e8f487f434eeff98c9a931cffe27eab3ed5d249daf060e5

data/CHANGELOG.md

@@ -106,3 +106,9 @@ All notable changes to this project will be documented in this file.
 ## [1.2.5] - 2026-05-27
 ### Changed
 - **Refactored `ProcessResult.clone()`:** Switched from fragmented dynamic allocation to a contiguous `std::vector` with explicit `.reserve()`. Eliminates heap fragmentation during high-res streaming.
+
+## [1.2.6] - 2026-05-31
+### Changed
+- **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.

data/Gemfile.lock

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

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

@@ -8,6 +8,7 @@
  */
 
 #include "Tests.h"
+#include <sys/resource.h>
 #include <string.h>
 #include <iostream>
 #include <list>
@@ -17,7 +18,6 @@
 #include <cstring>
 #include <algorithm>
 #include <cstdio>
-#include <sys/resource.h>
 
 #include "polygon/finder/PolygonFinder.h"
 #include "polygon/finder/concurrent/ClippedPolygonFinder.h"
@@ -279,7 +279,7 @@ double get_peak_rss() {
   This approach allows for processing large PNG files on systems where memory
   would otherwise be insufficient.
 */
-void stream_png_image(const std::string& filepath, uint32_t stripe_height) {
+void stream_png_image(const std::string& filepath, uint32_t stripe_height, bool generate_svg = false, bool generate_png = false) {
     std::vector<ProcessResult*> result_clones;
     std::vector<std::string> varguments = {};
     VerticalMerger vmerger(0, &varguments);
@@ -305,6 +305,7 @@ void stream_png_image(const std::string& filepath, uint32_t stripe_height) {
 
     // allocates stripe buffer
     RawBitmap stripe_bitmap;
+    std::cout << total_width << " " << stripe_height << std::endl;
     stripe_bitmap.define(total_width, stripe_height, 4, true);
     RGBNotMatcher not_matcher(-1);
 
@@ -315,6 +316,7 @@ void stream_png_image(const std::string& filepath, uint32_t stripe_height) {
     }
 
     size_t row_size = static_cast<size_t>(total_width) * 4;
+    int stripe_count = 0;
     // main stripes loop
     for (uint32_t current_y_offset = 0; current_y_offset < total_height; current_y_offset += stripe_height) {
       int uncovered_height = total_height - current_y_offset;
@@ -344,12 +346,13 @@ void stream_png_image(const std::string& filepath, uint32_t stripe_height) {
       PolygonFinder polygon_finder(&stripe_bitmap, &not_matcher, nullptr, &finder_arguments);
       ProcessResult *result = polygon_finder.process_info();
       if (result) {
-        std::cout << "Founds polygons: " << result->groups << std::endl;
+        std::cout << "stripe " << stripe_count << ": found polygons " << result->groups << std::endl;
         ProcessResult* safe_result = result->clone();
         result_clones.push_back(safe_result);
         vmerger.add_tile(*safe_result);
         delete result;
       }
+      stripe_count++;
     }
 
     std::cout << "Merging polygons ..." << std::endl;
@@ -357,15 +360,20 @@ void stream_png_image(const std::string& filepath, uint32_t stripe_height) {
 
     if (merged_result) {
       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");
+      if (generate_png) {
+        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;
+        }
+      }
+      if (generate_svg) {
+        merged_result->save_svg("whole.svg");
+        std::cout << "Svg saved!" << std::endl;
+      }
     }
     delete merged_result;
     // frees memory

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/RawBitmap.cpp

@@ -56,16 +56,16 @@ void RawBitmap::draw_pixel(int x, int y, unsigned char r, unsigned char g, unsig
   if (bpp > 3) p[3] = a;
 }
 
-uint32_t RawBitmap::define(uint width, uint height, int bytes_per_pixel, bool clear)
-{ this->width = width;
+size_t RawBitmap::define(uint width, uint height, int bytes_per_pixel, bool clear)
+{ this->width  = width;
   this->height = height;
   this->bpp = bytes_per_pixel;
-  uint32_t dimension = (static_cast<uint32_t>(width) * static_cast<uint32_t>(height)) * bytes_per_pixel;
+  size_t dimension = static_cast<size_t>(width) * static_cast<size_t>(height) * static_cast<size_t>(bytes_per_pixel);
   this->image = std::make_unique<unsigned char[]>(dimension);
   if (clear) {
     std::fill(image.get(), image.get() + dimension, 0);
   }
-  return dimension;
+  return static_cast<uint32_t>(dimension);
 }
 
 void RawBitmap::fill(unsigned char r, unsigned char g, unsigned char b, unsigned char a) {

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/RawBitmap.h

@@ -25,7 +25,7 @@ class RawBitmap : public Bitmap {
   unsigned int rgb_value_at(int x, int y);
   const unsigned char* get_row_ptr(int y) const;
   int get_bytes_per_pixel() const;
-  uint32_t define(uint width, uint height, int bytes_per_pixel, bool clear = false);
+  size_t define(uint width, uint height, int bytes_per_pixel, bool clear = false);
   void draw_pixel(int x, int y, unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255);
   bool save_to_png(const std::string& filename);
   void fill(unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255);

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/spng.c

@@ -534,7 +534,7 @@ static void u16_row_to_bigendian(void *row, size_t size)
         write_u16(&px[i], px[i]);
     }
 }
-
+/*
 static void rgb8_row_to_rgba8(const unsigned char *row, unsigned char *out, uint32_t n)
 {
     uint32_t i;
@@ -543,6 +543,22 @@ static void rgb8_row_to_rgba8(const unsigned char *row, unsigned char *out, uint
         memcpy(out + i * 4, row + i * 3, 3);
         out[i*4+3] = 255;
     }
+}*/
+
+/* Fix overflow Gigapixel images */
+static void rgb8_row_to_rgba8(const unsigned char *row, unsigned char *out, uint32_t n)
+{
+    size_t i;
+    for(i=0; i < n; i++)
+    {
+        out[0] = row[0];
+        out[1] = row[1];
+        out[2] = row[2];
+        out[3] = 255;
+
+        out += 4;
+        row += 3;
+    }
 }
 
 static unsigned num_channels(const struct spng_ihdr *ihdr)

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

@@ -147,50 +147,37 @@ 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) + "\">");
+  void to_svg_stream(std::ostream& os) const {
+    os << "<svg xmlns=\"http://www.w3.org/2000/svg\" "
+       << "width=\"" << width << "\" height=\"" << height << "\">\n";
     for (const auto& poly : polygons) {
-      { // outer
-        std::ostringstream pts;
+      // --- OUTER (Red) ---
+      if (!poly.outer.empty()) {
+        os << "<polygon points=\"";
         bool first = true;
         for (const Point* p : poly.outer) {
           if (!p) continue;
-          if (!first)
-              pts << " ";
+          if (!first) os << " ";
           first = false;
-          pts << p->x << "," << p->y;
+          os << p->x << "," << p->y;
         }
-        lines.push_back(
-          "<polygon points=\"" + pts.str() +
-          "\" fill=\"none\" stroke=\"red\" stroke-width=\"1\"/>");
+        os << "\" fill=\"none\" stroke=\"red\" stroke-width=\"1\"/>\n";
       }
-      // inner
+      // --- INNER (Green) ---
       for (const auto& sequence : poly.inner) {
         if (sequence.empty()) continue;
-        std::ostringstream pts;
+        os << "<polygon points=\"";
         bool first = true;
         for (const Point* p : sequence) {
           if (!p) continue;
-          if (!first) pts << " ";
+          if (!first) os << " ";
           first = false;
-          pts << p->x << "," << p->y;
+          os << p->x << "," << p->y;
         }
-        lines.push_back(
-          "<polygon points=\"" + pts.str() +
-          "\" fill=\"none\" stroke=\"green\" stroke-width=\"1\"/>");
+        os << "\" fill=\"none\" stroke=\"green\" stroke-width=\"1\"/>\n";
       }
     }
-    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();
+    os << "</svg>";
   }
 
   void save_svg(const std::string& filename) const {
@@ -198,7 +185,7 @@ struct ProcessResult {
     if (!file.is_open()) {
       throw std::runtime_error("Unable to open SVG file: " + filename);
     }
-    file << to_svg();
+    to_svg_stream(file);
     file.close();
   }
 };

data/lib/contrek/version.rb

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

metadata

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