Fixed memory leak

src/limits.cpp

@@ -19,6 +19,30 @@ Limits::Limits(bool original) :
  }
 }
 
+Limits::~Limits()
+{
+ // Delete original
+ if (original_ != nullptr) {
+ delete original_;
+ }
+}
+
+Limits &Limits::operator=(const Limits &other)
+{
+ // Copy limits
+ set(other.left(), other.right(), other.top(), other.bottom());
+
+ // Deep copy original limits
+ if (original_ != nullptr) {
+ setOriginal(
+ other.original()->left(),
+ other.original()->right(),
+ other.original()->top(),
+ other.original()->bottom());
+ }
+ return *this;
+}
+
 bool Limits::operator==(const Limits &other) const
 {
  // Check if limits are the same
@@ -106,6 +130,12 @@ void Limits::set(double left, double right, double top, double bottom)
  bottom_ = bottom;
 }
 
+void Limits::setOriginal(double left, double right, double top, double bottom)
+{
+ // Set original limits
+ original_->set(left, right, top, bottom);
+}
+
 double Limits::width() const
 {
  // Return width
@@ -148,12 +178,6 @@ QVector4D Limits::vec4() const
  return QVector4D(top_, right_, bottom_, left_);
 }
 
-Limits *Limits::original()
-{
- // Return pointer to original limits
- return original_;
-}
-
 double Limits::zoomFactor() const
 {
  // Return zoomFactor
@@ -172,3 +196,9 @@ void Limits::setZoomFactor(double zoomFactor)
  top_ = yMid + h2;
  bottom_ = yMid - h2;
 }
+
+const Limits *Limits::original() const
+{
+ // Return pointer to original limits
+ return original_;
+}

src/limits.h

@@ -14,13 +14,16 @@ class Limits
 {
 public:
  Limits(bool original = false);
+ ~Limits();
+ Limits &operator=(const Limits &other);
  bool operator==(const Limits &other) const;
  bool operator!=(const Limits &other) const;
  void move(QPoint distance, const QSize &ref);
  void zoom(bool in, double xw, double yw);
  void reset(QSize size);
  void resize(QSize delta);
  void set(double left, double right, double top, double bottom);
+ void setOriginal(double left, double right, double top, double bottom);
 
  double width() const;
  double height() const;
@@ -29,9 +32,9 @@ class Limits
  double top() const;
  double bottom() const;
  QVector4D vec4() const;
- Limits *original();
  double zoomFactor() const;
  void setZoomFactor(double zoomFactor);
+ const Limits *original() const;
 
 private:
  double left_;

src/renderer.cpp

@@ -29,14 +29,14 @@ inline void iterateX(ImageLine &il)
 {
  // Iterate x-pixels
  const quint8 rootCount = il.params->roots.count();
- const Limits limits = il.params->limits;
- const double xFactor = limits.width() / (il.lineSize - 1);
+ const double left = il.params->limits.left();
+ const double xFactor = il.params->limits.width() / (il.lineSize - 1);
  const complex d = il.params->damping;
 
  for (int x = 0; x < il.lineSize; ++x) {
 
  // Create complex number from current pixel
- il.zx = x * xFactor + limits.left();
+ il.zx = x * xFactor + left;
  complex z(il.zx, il.zy);
 
  // Newton iteration
@@ -158,8 +158,7 @@ void Renderer::renderFractal()
  for (int y = 0; y < height; ++y) {
  ImageLine il((QRgb*)(image->scanLine(y)), y, image->width(), &curParams_);
  il.zy = y * yFactor + curParams_.limits.top();
-// lines->append(il);
- (*lines)[y] = il; // <- Preallocation requires a default ImageLine()
+ (*lines)[y] = il;
  }
 
  // Set thread count to either single or multicore

src/settingswidget.cpp

@@ -298,7 +298,7 @@ void SettingsWidget::importSettings()
  params_->limits.set(
  ini.value("left", 1).toDouble(), ini.value("right", 1).toDouble(),
  ini.value("top", 1).toDouble(), ini.value("bottom", 1).toDouble());
- params_->limits.original()->set(
+ params_->limits.setOriginal(
  ini.value("left_original", 1).toDouble(), ini.value("right_original", 1).toDouble(),
  ini.value("top_original", 1).toDouble(), ini.value("bottom_original", 1).toDouble());
  ini.endGroup();