Merge pull request #11 from stevenewald/stack

Fix stack overflow by making return array unique_ptr
stevenewald · Nov 28, 2024 · 49e83f1 · 49e83f1
2 parents 8f115c2 + 298b05c
commit 49e83f1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/source/config.hpp b/source/config.hpp
@@ -7,8 +7,8 @@
 
 namespace fractal {
 
-constexpr std::size_t WINDOW_WIDTH = 800UZ;
-constexpr std::size_t WINDOW_HEIGHT = 600UZ;
+constexpr std::size_t WINDOW_WIDTH = 800UZ * 2;
+constexpr std::size_t WINDOW_HEIGHT = 600UZ * 2;
 constexpr std::size_t FRAME_RATE = 60UZ;
 
 constexpr complex_domain START_COMPLEX_DOMAIN{

diff --git a/source/mandelbrot/mandelbrot_window.cpp b/source/mandelbrot/mandelbrot_window.cpp
@@ -35,7 +35,7 @@ std::array<float, 8> MandelbrotWindow::draw_coordinate_(
     return ret;
 }
 
-MandelbrotWindow::arr MandelbrotWindow::calculate_(
+std::unique_ptr<MandelbrotWindow::arr> MandelbrotWindow::calculate_(
     const DisplayDomain& full_display_domain, const DisplayDomain& new_domain_selection
 )
 {
@@ -45,14 +45,14 @@ MandelbrotWindow::arr MandelbrotWindow::calculate_(
         return draw_coordinate_(coord, to_complex_.to_complex_projections(coord));
     };
 
-    arr ret;
+    auto ret = std::make_unique<arr>();
     auto process_chunk = [&](DisplayDomain::DisplayCoordinateIterator start,
                              DisplayDomain::DisplayCoordinateIterator end) {
         for (auto it = start; it != end; it += 8) {
             display_coordinate pos = *it;
             std::array<float, 8> t = process_coordinates(pos);
             for (size_t i = 0; i < 8; ++i) {
-                ret[pos.x++][pos.y] = Percentage{t[i]};
+                (*ret)[pos.x++][pos.y] = Percentage{t[i]};
             }
         }
     };

diff --git a/source/mandelbrot/mandelbrot_window.hpp b/source/mandelbrot/mandelbrot_window.hpp
@@ -10,6 +10,8 @@
 #include <SFML/Graphics/Sprite.hpp>
 #include <SFML/Graphics/Texture.hpp>
 
+#include <memory>
+
 namespace fractal {
 class MandelbrotWindow {
     using arr = std::array<std::array<Percentage, WINDOW_HEIGHT + 8>, WINDOW_WIDTH + 8>;
@@ -24,7 +26,7 @@ class MandelbrotWindow {
         const DisplayDomain& display_domain, const complex_domain& complex_domain
     );
 
-    arr calculate_(
+    std::unique_ptr<arr> calculate_(
         const DisplayDomain& full_display_domain,
         const DisplayDomain& new_domain_selection
     );

diff --git a/source/mandelbrot/window.hpp b/source/mandelbrot/window.hpp
@@ -42,9 +42,9 @@ class Window : public DisplayEventObserver {
             display_domain.get_end_coordinate().y + 1u
         );
 
-        auto res = mandelbrot_.calculate_(display_domain, display_domain);
+        auto res = mandelbrot_.calculate_(DISPLAY_DOMAIN, DISPLAY_DOMAIN);
         for (display_coordinate pos : DISPLAY_DOMAIN) {
-            set_pixel_color(pos, res[pos.x][pos.y]);
+            set_pixel_color(pos, (*res)[pos.x][pos.y]);
         }
     }
 
@@ -62,7 +62,7 @@ class Window : public DisplayEventObserver {
         );
         auto res = mandelbrot_.calculate_(DISPLAY_DOMAIN, ends);
         for (display_coordinate pos : DISPLAY_DOMAIN) {
-            set_pixel_color(pos, res[pos.x][pos.y]);
+            set_pixel_color(pos, (*res)[pos.x][pos.y]);
         }
     }