1. 24 Apr, 2012 4 commits
  2. 23 Apr, 2012 21 commits
    • Marcus D. Hanwell's avatar
      COMP: VLAs are not supported by MSVC (C99). · 99b9af87
      Marcus D. Hanwell authored
      Just use a string, and removed inline from the protected methods -
      should be private if we want to inline them.
      
      Change-Id: I72b03b417e009862574e5ef27506dec64f73455f
      99b9af87
    • Kyle Lutz's avatar
      Fix VTK/Chemistry compilation error with OpenQube/Qt · 124e036a
      Kyle Lutz authored
      This fixes a compilation error in which the Qt headers
      required by the OpenQube headers could not be found
      because the Qt include directories were not setup when
      compiling VTK/Chemistry.
      
      Change-Id: I60a38ca2d95b62571955c6498421eeeceb6aa3b8
      124e036a
    • Utkarsh Ayachit's avatar
      Merge remote branch 'origin/master' into HEAD · fc93e3fc
      Utkarsh Ayachit authored
      * origin/master: (325 commits)
        BUG #13118. Fix segfault due to dangling pointers.
        COMP: Fix python wrapping of GUISupport/Qt classes in release.
        Eliminated a (shadowed declaration) warning from HT grid
        Do not build (but yet retain) a currently problematic test.
        Restored header file of vtk hyper tree source that got lost
        Fix for MFC compatibility issue with bad_alloc
        BUG 12810: Fix for int overflows in volume rendering module
        replace deprecated cmake remove command
        Remove vtkHyperTreeFractalSource.cxx from build
        Refactor VTK version handling
        Re-enable a unit test that was disabled by the modular changes.
        Enable Parallel Stream Tracer test
        Tab fix  asdfasdfasdf
        Add support for polygonal selection for charts
        KWSys Nightly Date Stamp
        Geometry fitler and changes in vtkHyperTreeGrid to support it.
        Created a new type of data set for hyper tree grids
        Running the tests with a hyper tree grid SOURCE now
        Had included a debug test by error
        Removed debug Print() statement
        ...
      
      Conflicts:
      	IO/vtkSTLReader.cxx
      
      Change-Id: Ie6f1ee8ef057a10ea6e7eb5da171865206ebdfea
      fc93e3fc
    • Marcus D. Hanwell's avatar
      Merge topic '13118_fix_charts_segfault-vtkmaster' into master · 72c80292
      Marcus D. Hanwell authored
      a0d8c06d Merge branch 'master' into 13118_fix_charts_segfault-vtkmaster
      6761eda5 BUG #13118. Fix segfault due to dangling pointers.
      72c80292
    • Dave DeMarle's avatar
      fix merge conflicts for release fix · 5fc2e728
      Dave DeMarle authored
      Change-Id: I5bb55a2847b0f4077cbf5dc4a9d58345f59077e8
      5fc2e728
    • Utkarsh Ayachit's avatar
      Updating comment. · 54832f74
      Utkarsh Ayachit authored
      Change-Id: I61114423e394561e6838e8ab262f0045892ac2c5
      54832f74
    • Utkarsh Ayachit's avatar
      Merge branch 'master' into 13118_fix_charts_segfault-vtkmaster · a0d8c06d
      Utkarsh Ayachit authored
      * master: (270 commits)
        Eliminated a (shadowed declaration) warning from HT grid
        Do not build (but yet retain) a currently problematic test.
        Restored header file of vtk hyper tree source that got lost
        Fix for MFC compatibility issue with bad_alloc
        BUG 12810: Fix for int overflows in volume rendering module
        replace deprecated cmake remove command
        Remove vtkHyperTreeFractalSource.cxx from build
        Refactor VTK version handling
        Re-enable a unit test that was disabled by the modular changes.
        Enable Parallel Stream Tracer test
        Tab fix  asdfasdfasdf
        Add support for polygonal selection for charts
        KWSys Nightly Date Stamp
        Geometry fitler and changes in vtkHyperTreeGrid to support it.
        Created a new type of data set for hyper tree grids
        Running the tests with a hyper tree grid SOURCE now
        Had included a debug test by error
        Removed debug Print() statement
        A new hyper tree grid source
        Added a vtkHyperTreeGridAlgorithm
        ...
      
      Conflicts:
      	Charts/vtkContextInteractorStyle.h
      
      Change-Id: Ib31a58e24c2a65a4dbd161721ee708a285f79578
      a0d8c06d
    • Utkarsh Ayachit's avatar
      BUG #13118. Fix segfault due to dangling pointers. · 6761eda5
      Utkarsh Ayachit authored
      Avoid dangling pointers in vtkContextInteractorStyle by using vtkWeakPointer.
      This fixes a segfault that showed up on Windows due to the order in which the
      objects were getting deleted on exit in ParaView.
      
      Change-Id: Ib606bd8583d96a52dbe04be7997713155c0f79b9
      6761eda5
    • David Gobbi's avatar
      COMP: Fix python wrapping of GUISupport/Qt classes in release. · 94493332
      David Gobbi authored
      A modification to GUISupport/Qt/CMakeLists.txt in commit 7aaf1d8e,
      meant to enhance the wrapping QVTKInteractor, had some serious side
      effects on the wrapping in this directory.  These were undetected
      because this directory is only wrapped if VTK_WRAP_PYTHON_SIP is ON.
      This commit reverts the changes of commit 7aaf1d8e and instead fixes
      the QVTKInteractor issue by hard-coding its name into vtkWrapPython.c.
      After this is merged, the hard-coded class name will be removed from
      vtkWrapPython.c in the master branch.
      
      Change-Id: I1dd2f6227997e9df62710e76459361de4c7b2459
      94493332
    • Kyle Lutz's avatar
      Add export for TIFFSetTagExtender in vtktiff · de2856a9
      Kyle Lutz authored
      This adds an export for the TIFFSetTagExtender symbol
      for the vtktiff third party library.
      
      Change-Id: Ic3ef9f4744d4c02be5b08770afd50bc2e463a5ea
      de2856a9
    • Dave DeMarle's avatar
      Merge branch 'release' · 1548035a
      Dave DeMarle authored
      Change-Id: Id9ffab84985116f173aeab39390f19d24443eb2f
      1548035a
    • Brad King's avatar
      Merge topic 'FixHyperTreeFractalSourceAndTestHyperTreeGrid' into master · 69414c7f
      Brad King authored
      e1b20f0b Eliminated a (shadowed declaration) warning from HT grid
      0fdf3659 Do not build (but yet retain) a currently problematic test.
      b3153abe Restored header file of vtk hyper tree source that got lost
      69414c7f
    • Philippe Pébay's avatar
      Eliminated a (shadowed declaration) warning from HT grid · e1b20f0b
      Philippe Pébay authored
      Change-Id: I85c632c47cb4e41a3b76699d5bd268e26e78c4e3
      e1b20f0b
    • Philippe Pébay's avatar
      Do not build (but yet retain) a currently problematic test. · 0fdf3659
      Philippe Pébay authored
      NB: This test will be restored later after having merged from a
      more advanced topic branch.
      
      Change-Id: Ic59e63f193c70cbf4ea47b6db12264fa302f5e64
      0fdf3659
    • Philippe Pébay's avatar
      Restored header file of vtk hyper tree source that got lost · b3153abe
      Philippe Pébay authored
      Change-Id: Ic9e122db6ba80f6a50c0e7de5c0a5438b67f0fdf
      b3153abe
    • Dave DeMarle's avatar
      Merge branch 'replace-deprecated-remove-cmake-command' into release · 90764ae6
      Dave DeMarle authored
      Change-Id: I0c28ac07fa0c62ba20fc91f89b58f423f6691faf
      90764ae6
    • Dave DeMarle's avatar
      Merge branch 'freetype-gcc-4-7' into release · 4e394cfe
      Dave DeMarle authored
      Change-Id: Iad003a0d6fb9b85dd1abccdbd8adb4a7636b55a6
      4e394cfe
    • Dave DeMarle's avatar
      Merge branch 'fix-int-overflows-in-volume-rendering-rel' into release · 5eb0cf0c
      Dave DeMarle authored
      Change-Id: I1005acf98e18eaf98593aa0c97b386ef7f04fd04
      5eb0cf0c
    • Pavel Pokutnev's avatar
      Fix for MFC compatibility issue with bad_alloc · c44bf3a0
      Pavel Pokutnev authored
      To be able to catch allocation failures, when VTK is running in the context of other framework (e.g. MFC), we should use (...) in the catch handler instead of std::bad_alloc. If hosting framework implements its own operator new, it's possible that it will throw own defined exception and not the standard std::bad_alloc! In the case of MFC this is CMemoryException, so it would not be handled correctly and crash.
      
      BUG ID 0013018: http://vtk.org/Bug/view.php?id=13018
      
      Change-Id: Ic47b1666116a4299d85e9b86a5d1b13a72822a94
      c44bf3a0
    • David Gobbi's avatar
      BUG 12810: Fix for int overflows in volume rendering module · 49e4f9c8
      David Gobbi authored
      Change-Id: Ib160d59a69d103501de97a5899dac5b89bfb77ae
      49e4f9c8
    • Dave DeMarle's avatar
      replace deprecated cmake remove command · 4372234c
      Dave DeMarle authored
      Change-Id: I337eabe2854293fec60391af0ba7a8ef09b22541
      4372234c
  3. 20 Apr, 2012 15 commits