[SCM] Paraview packaging branch, master, updated. upstream/3.12.0-148-g6d0a50d

[Anton Gladky]

The following commit has been merged in the master branch:
commit e04e98a66835448c0fd0caedae84f555d075a96d
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Feb 23 21:58:41 2012 +0100

    Remove fix_memory_animation_leak.patch. Applied by upstream.

diff --git a/debian/patches/fix_memory_animation_leak.patch b/debian/patches/fix_memory_animation_leak.patch
deleted file mode 100644
index 3746e13..0000000
--- a/debian/patches/fix_memory_animation_leak.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Description: fixes "out of memory when exporting animations"
-Author: Utkarsh Ayachit <utkarsh.ayachit at kitware.com>
-Origin: http://www.paraview.org/pipermail/paraview/2011-December/023481.html
-Bug: http://www.vtk.org/Bug/view.php?id=12424
-Applied-Upstream: http://www.vtk.org/gitweb?p=VTK.git;a=commit;h=0f9080648f1086b8abaecbc8bdfdbf9e58e66451
-                  http://paraview.org/gitweb?p=stage/ParaView.git;a=commit;h=5a22b27811fe928209101d26b657c59334c43e5b
-Last-Update: 2011-12-13
-
-
---- a/VTK/Rendering/vtkOpenGLDisplayListPainter.cxx
-+++ b/VTK/Rendering/vtkOpenGLDisplayListPainter.cxx
-@@ -42,17 +42,13 @@
-   // Refers to the build time of the first display list.
-   vtkTimeStamp BuildTime;
- 
--  void ReleaseAllLists(vtkWindow* win)
-+  void ReleaseAllLists()
-     {
--    // Checking is win->GetMapped() is causing segfaults on AIX.
--    if (win /*&& win->GetMapped()*/)
-+    DisplayListMapType::iterator iter;
-+    for (iter = this->DisplayListMap.begin(); iter != this->DisplayListMap.end();
-+      iter++)
-       {
--      DisplayListMapType::iterator iter;
--      for (iter = this->DisplayListMap.begin(); iter != this->DisplayListMap.end();
--        iter++)
--        {
-         glDeleteLists(iter->second, 1);
--        }
-       }
-     this->DisplayListMap.clear();
-     }
-@@ -100,7 +96,7 @@
-   if (win && win->GetMapped())
-     {
-     win->MakeCurrent();
--    this->Internals->ReleaseAllLists(win);
-+    this->Internals->ReleaseAllLists();
-     }
-   this->Internals->DisplayListMap.clear();
-   this->Superclass::ReleaseGraphicsResources(win);
-@@ -113,11 +109,11 @@
-                                                  unsigned long typeflags,
-                                                  bool forceCompileOnly)
- {
--  if (this->GetMTime() > this->Internals->BuildTime ||
--    (this->LastWindow && (renderer->GetRenderWindow() != this->LastWindow.GetPointer())))
-+  // if active render window has changed, then release the old display lists on
-+  // the old window, if the old window is still valid.
-+  if (this->LastWindow &&
-+    (renderer->GetRenderWindow() != this->LastWindow.GetPointer()))
-     {
--    // MTime changes when input changes or someother iVar changes, so display
--    // lists are obsolete so we can let go of them.
-     this->ReleaseGraphicsResources(this->LastWindow);
-     renderer->GetRenderWindow()->MakeCurrent();
-     }
-@@ -141,6 +137,8 @@
-   // First check for the cases where all display lists (irrespective of
-   // typeflags are obsolete.
-   if (
-+    // the painter has changed.
-+    this->GetMTime() > this->Internals->BuildTime ||
-     // Since input changed
-     input->GetMTime() > this->Internals->BuildTime  ||
-     // actor's properties were modified
-@@ -148,7 +146,7 @@
-     // mapper information was modified
-     this->Information->GetMTime() > this->Internals->BuildTime)
-     {
--    this->Internals->ReleaseAllLists(this->LastWindow);
-+    this->Internals->ReleaseAllLists();
-     this->LastWindow = 0;
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index cab3e8c..d02b495 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ fix_vtkxdmf_xt.patch
 removesqlite.patch
 install_htmldoc.patch
 kwprocessxml_rpath.patch
-fix_memory_animation_leak.patch
 fix_format_not_a_string_FTBFS.patch
 workaround_strict-aliasing_in_mpi4py_MPI.patch
 fix_boost-1.48_compilation.patch

-- 
Paraview packaging