Merge lp:~thumper/nux/next-changes into lp:nux

[Tim Penhey]

Unmerged revisions

445. By Tim Penhey on 2011-08-22

Merge object cleanup branch.

444. By Tim Penhey on 2011-08-19

make the background stack private, and make sure the layers get deleted when the object is destroyed.

443. By Tim Penhey on 2011-08-19

Delete the shader_prog once we are done.

=== modified file 'Nux/Painter.cpp'
--- Nux/Painter.cpp	2011-06-13 13:34:21 +0000
+++ Nux/Painter.cpp	2011-08-22 21:31:36 +0000
@@ -172,6 +172,7 @@
 
   BasePainter::~BasePainter()
   {
+    EmptyBackgroundStack();
   }
 
   int BasePainter::PaintColorTextLineEdit (GraphicsEngine &GfxContext, const Geometry &g, const NString &Str,
@@ -782,7 +783,7 @@
 
   void BasePainter::PaintBackground (GraphicsEngine &GfxContext, const Geometry &geo)
   {
-    if (m_BackgroundStack.begin () == m_BackgroundStack.end ())
+    if (m_BackgroundStack.empty())
     {
       return;
     }
@@ -940,6 +941,10 @@
 
   void BasePainter::EmptyBackgroundStack()
   {
+    for (auto layer : m_BackgroundStack)
+    {
+      delete layer;
+    }
     m_BackgroundStack.clear();
   }
 
 
=== modified file 'Nux/Painter.h'
--- Nux/Painter.h	2011-05-10 23:31:36 +0000
+++ Nux/Painter.h	2011-08-22 21:31:36 +0000
@@ -309,10 +309,10 @@
     void EmptyBackgroundStack();
     void PaintBackground (GraphicsEngine &GfxContext, const Geometry &geo);
 
+  private:
+
     std::list<AbstractPaintLayer *> m_BackgroundStack;
 
-  private:
-
   };
 
 
 
=== modified file 'NuxGraphics/RenderingPipeGLSL.cpp'
--- NuxGraphics/RenderingPipeGLSL.cpp	2011-08-19 02:44:33 +0000
+++ NuxGraphics/RenderingPipeGLSL.cpp	2011-08-22 21:31:36 +0000
@@ -761,7 +761,7 @@
     _horizontal_hq_gauss_filter_prog[k-1]->AddShaderObject(PS);
     CHECKGL(glBindAttribLocation(_horizontal_hq_gauss_filter_prog[k-1]->GetOpenGLID(), 0, "AVertex"));
     _horizontal_hq_gauss_filter_prog[k-1]->Link();
-
+    delete [] shader_prog;
   }
 
   void GraphicsEngine::InitSLVerticalHQGaussFilter(int sigma)
@@ -832,6 +832,7 @@
     _vertical_hq_gauss_filter_prog[k-1]->AddShaderObject (PS);
     CHECKGL ( glBindAttribLocation (_vertical_hq_gauss_filter_prog[k-1]->GetOpenGLID(), 0, "AVertex") );
     _vertical_hq_gauss_filter_prog[k-1]->Link();
+    delete [] shader_prog;
   }
 
   void GraphicsEngine::InitSLColorMatrixFilter ()