implement printer controls; implement calibration data collection

1 files changed, 10 insertions, 4 deletions

diff --git a/imagealgos.cpp b/imagealgos.cpp
index e22f1bd..3e84155 100644
--- a/imagealgos.cpp
+++ b/imagealgos.cpp
@@ -31,10 +31,11 @@ size_t pgm_save(Image *img, FILE *outfile, bool really_save) {
     n += sprintf((char*)pgm_image, "P5\n%d %d\n%d\n",
                  img->width, img->height, 0xFF);
 
-    for (size_t i = 0; i < img->width * img->height; ++i)
+    // for (size_t i = 0; i < img->width * img->height; ++i)
+    for (size_t i = 0; i < img_width * img_height; ++i)
     {
         uint16_t *pixels = (uint16_t*)img->data;
-        const auto p = pixels[i];
+        // const auto p = pixels[i];
         uint8_t value = (pixels[i] & 0xFF00) >> 8;
 
         // n += fwrite(&value, 1, 1, outfile);
@@ -249,15 +250,18 @@ float process_column(uint16_t (&column)[])
 #endif
 }
 
-void process_columns(Image &image)
+Pixels process_columns(Image &image)
 {
+    Pixels result;
+    result.counters = image.counters;
+
     // std::cout << "here\n";
     start_timer(process_columns);
 
     for (size_t i = 0; i < image.width; i++)
     {
         // smooth_column(image.rotated_cw[i]);
-        image.pixels[i] = process_column(image.rotated_cw[i]);
+        result.pixels[i] = process_column(image.rotated_cw[i]);
         // Algo genetic(image.rotated_cw[i]);
 
         // image.pixels[i] = genetic.run().a;
@@ -268,4 +272,6 @@ void process_columns(Image &image)
     }
 
     stop_timer(process_columns);
+
+    return result;
 }