fixed readme conflict

1 files changed, 7 insertions, 2 deletions

diff --git a/mthread.hpp b/mthread.hpp
index c70647e..bd1853e 100644
--- a/mthread.hpp
+++ b/mthread.hpp
@@ -33,7 +33,7 @@ class mthread {
         std::complex<double> c_min, std::complex<double> c_max, 
          unsigned int inf_cutoff, unsigned int max_iter, png& image, double *g_vmap, unsigned int *g_histogram, 
         mthread **worker_list, unsigned int id, unsigned int jobs, std::atomic<uint32_t>& progress);
-    ~mthread();
+    virtual ~mthread(); //virtual in case a modified renderer needs to allocate memory
     void join();
     void dispatch();
 
@@ -61,9 +61,14 @@ class mthread {
     uint32_t x_min, x_max, y_min, y_max;
     uint32_t on_x, on_y;
     unsigned int divisions;
-    void render();
     int state;
     struct mthread_divinfo divide();
+    
+    virtual void render_area();
+
+    void run();
+    bool find_work();
+    void check_work_request();
 
 
 };