contrek 1.0.4 → 1.0.6

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

@@ -1,42 +1,41 @@
 /*
  * FastPngBitmap.h
  *
- *  Created on: 17 gen 2019
+ *  Created on: 23 nov 2025
  *      Author: ema
+ *      Copyright 2025 Emanuele Cesaroni
  */
 
-#ifndef POLYGON_BITMAPS_FASTPNGBITMAP_H_
-#define POLYGON_BITMAPS_FASTPNGBITMAP_H_
-
-#include "Bitmap.h"
+#pragma once
 #include <vector>
 #include <cstddef>
+#include <string>
+#include "Bitmap.h"
+
 class RGBMatcher;
 
 static const std::string base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 class FastPngBitmap : public Bitmap {
-public:
-  FastPngBitmap(std::string filename);
-  virtual ~FastPngBitmap();
-  bool pixel_match(int x,int y,Matcher *matcher);
+ public:
+  explicit FastPngBitmap(std::string filename);
+  bool pixel_match(int x, int y, Matcher *matcher);
   int h();
   int w();
   virtual int error();
-  char value_at(int x,int y);
-  unsigned int rgb_value_at(int x,int y);
-protected:
+  char value_at(int x, int y);
+  unsigned int rgb_value_at(int x, int y);
+  const unsigned char* get_row_ptr(int y) const;
+  int get_bytes_per_pixel() const;
+
+ protected:
   std::vector<unsigned char> buffer;
   std::vector<unsigned char> base64_decode(std::string &encoded_string);
   std::vector<unsigned char> image;
-  unsigned long width,height;
-  unsigned char *last_red = nullptr;
+  unsigned int width, height;
   int png_error;
   int decodePNG(std::vector<unsigned char>& out_image, unsigned long& image_width, unsigned long& image_height, const unsigned char* in_png, size_t in_size, bool convert_to_rgba32 = true);
 
-private:
+ private:
   void loadFile(std::vector<unsigned char>& buffer, const std::string& filename);
-
 };
-
-#endif /* POLYGON_BITMAPS_FASTPNGBITMAP_H_ */

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

@@ -16,15 +16,32 @@
 #include <string>
 #include "../matchers/RGBMatcher.h"
 #include "../matchers/RGBNotMatcher.h"
+#include "spng.h"
 
 RemoteFastPngBitmap::RemoteFastPngBitmap(std::string *dataurl) : FastPngBitmap("") {
-  buffer = base64_decode(*dataurl);
-  int error = decodePNG(image, width, height, buffer.empty() ? 0 : &buffer[0], (unsigned long) buffer.size(), true);
-    if (error != 0) std::cout << "error: " << error << std::endl;
-    this->last_red = &image[0];
+    buffer = base64_decode(*dataurl);
+    if (buffer.empty()) {
+      this->png_error = 1;
+      return;
+    }
+    spng_ctx *ctx = spng_ctx_new(0);
+    spng_set_png_buffer(ctx, buffer.data(), buffer.size());
+    struct spng_ihdr ihdr;
+    int error = spng_get_ihdr(ctx, &ihdr);
+    if (!error) {
+      this->width = ihdr.width;
+      this->height = ihdr.height;
+      size_t out_size;  // RGBA8 dimension
+      spng_decoded_image_size(ctx, SPNG_FMT_RGBA8, &out_size);
+      this->image.resize(out_size);
+      error = spng_decode_image(ctx, image.data(), out_size, SPNG_FMT_RGBA8, SPNG_DECODE_TRNS);
+    }
+    if (error != 0) {
+      std::cout << "spng error: " << spng_strerror(error) << std::endl;
+    }
     this->png_error = error;
+    spng_ctx_free(ctx);
 }
 
 RemoteFastPngBitmap::~RemoteFastPngBitmap() {
 }
-

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

@@ -6,21 +6,17 @@
  *      Copyright 2025 Emanuele Cesaroni
  */
 
-#ifndef POLYGON_BITMAPS_REMOTEFASTPNGBITMAP_H_
-#define POLYGON_BITMAPS_REMOTEFASTPNGBITMAP_H_
-
-#include "FastPngBitmap.h"
-#include "Bitmap.h"
+#pragma once
 #include <vector>
 #include <string>
 #include <cstddef>
+#include "FastPngBitmap.h"
+#include "Bitmap.h"
 
 class RGBMatcher;
 
 class RemoteFastPngBitmap: public FastPngBitmap {
  public:
-  RemoteFastPngBitmap(std::string *dataurl);
+  explicit RemoteFastPngBitmap(std::string *dataurl);
   virtual ~RemoteFastPngBitmap();
 };
-
-#endif /* POLYGON_BITMAPS_REMOTEFASTPNGBITMAP_H_ */