1. 08 Apr, 2013 2 commits
  2. 05 Apr, 2013 10 commits
    • David Gobbi's avatar
      Merge topic 'Wconditional-uninitialized' into master · 06ad3dea
      David Gobbi authored
      19931660 Suppress -Wconditional-uninitialized warning
      9c896273 Suppress -Wconditional-uninitialized warning
      06ad3dea
    • Sean McBride's avatar
      Suppress -Wconditional-uninitialized warning · 19931660
      Sean McBride authored
      clang warned that 'count' was maybe used
      uninitialised, because, I think, it didn't realize
      that you can only get into the 'while' if you
      previously got into the 'if'.  So just moved
      the 'while' into the 'if'.
      
      Change-Id: I1360e16c3af3186c8b0a65c4db1011c2d5f057a9
      19931660
    • Sean McBride's avatar
      Suppress -Wconditional-uninitialized warning · 9c896273
      Sean McBride authored
      Init pointer variable to NULL to suppress
      Wconditional-uninitialized warning.
      
      Change-Id: I7f09bd24cfc00778084617dfaf2e3a262c561e66
      9c896273
    • Brad King's avatar
      Merge topic 'vtk-wrapping-depends' into master · 226351b3
      Brad King authored
      05a4febb COMP: Fix static library dependencies on VS 7
      226351b3
    • Brad King's avatar
      COMP: Fix static library dependencies on VS 7 · 05a4febb
      Brad King authored
      Visual Studio 7 and 7.1 do not support direct dependencies between static
      library targets cleanly.  CMake works around the problem by adding a
      custom "_UTILITY" target in between, but only does it for explicit
      add_dependencies and not for target_link_libraries because the extra
      targets are ugly and the dependencies are not needed only for compiling
      sources.
      
      Now that VTK uses custom commands to run vtkWrapHierarchy when building
      module libraries we need the library target ordering dependencies to be
      enforced.  In the case of STATIC libraries on VS 7, use an explicit
      add_dependencies call to tell CMake to use the work around to enforce the
      target build order.  In other cases the existing target_link_libraries is
      enough.
      
      Change-Id: I62c934669cedfdb23f7cf8f6cd1e7ee1d1f1d427
      05a4febb
    • Brad King's avatar
      Merge topic 'vtk-wrapping-depends' into master · b95d0f33
      Brad King authored
      1f6a2dcb COMP: Do not attach Tcl wrapping to vtk*.h class headers
      b95d0f33
    • Sean McBride's avatar
      Merge topic 'Wshift-sign-overflow' into master · 78fe1d70
      Sean McBride authored
      6beda6f0 Fixed -Wshift-sign-overflow warning
      78fe1d70
    • Brad King's avatar
      COMP: Do not attach Tcl wrapping to vtk*.h class headers · 1f6a2dcb
      Brad King authored
      Do not attach rules to generate vtk*Tcl.cxx wrapper files to the
      corresponding vtk*.h class headers with MAIN_DEPENDENCY.  This causes
      the Tcl wrapping rules to run while building the main <mod> library in
      addition to the <mod>TCL library where they belong.  Instead just add
      the vtk*.h class header as a DEPENDS of each rule as is done for Python
      and Java wrapping already.
      
      Change-Id: I21d1c0956a97f9d187247227a4431526b4eddb37
      1f6a2dcb
    • Sebastien Jourdain's avatar
      Merge remote-tracking branch 'pvvtk/pv-master' into HEAD · 7d053afd
      Sebastien Jourdain authored
      Change-Id: I2faac2d07005719ee8b52d5c073b208947569c23
      7d053afd
    • Sebastien Jourdain's avatar
      Merge topic 'forward-to-vtk-master' into pv-master · 933647b3
      Sebastien Jourdain authored and Kitware Robot's avatar Kitware Robot committed
      1e54ac16 Merge topic 'python-custom-hints' into master
      026ccf32 Merge topic 'python-hierarchy-dep' into master
      d3155f9b Simplify vtkWrapHierarchy invocation
      e62bff86 Merge topic 'python-install-rules' into master
      ed0d4e81 These should be appending the WRAP_HINTS to the vars
      e5323fc7 Fixed copy/paste error - WRAP_HINTS install path
      fcf221c7 Merge topic 'composite-pipeline-as-default' into master
      95d4ca64 Added facility to export custom hints for modules
      7f7586e4 Removed vtk.qt - Qt 3 is not supported in VTK
      2ef97890 Changed the default executive to be vtkCompositeDataPipeline.
      11e36798 Merge topic 'fixed-unused-var-warning' into master
      95ef69b4 Fixed warning about unused variable.
      b60cc9c7 Merge topic 'pyramid_apex_search_tolerance' into master
      2704cf30 Fixing the interior check tolerance for the apex of vtkPyramid.
      c6195a3a Merge topic 'misc-warnings' into master
      44fac21d Merge topic 'missing-VTK_LEGACY' into master
      ...
      933647b3
  3. 04 Apr, 2013 6 commits
    • Marcus D. Hanwell's avatar
      Merge topic 'python-custom-hints' into master · 1e54ac16
      Marcus D. Hanwell authored
      ed0d4e81 These should be appending the WRAP_HINTS to the vars
      e5323fc7 Fixed copy/paste error - WRAP_HINTS install path
      95d4ca64 Added facility to export custom hints for modules
      1e54ac16
    • Brad King's avatar
      Merge topic 'python-hierarchy-dep' into master · 026ccf32
      Brad King authored
      d3155f9b Simplify vtkWrapHierarchy invocation
      026ccf32
    • Brad King's avatar
      Simplify vtkWrapHierarchy invocation · d3155f9b
      Brad King authored
      Run vtkWrapHierarchy as a custom command in each module library target
      instead of as a POST_BUILD event.  Use a stamp file as the output so the
      actual hierarchy file may be modified only when its content changes.
      Depend on all the input header files, vtkWrapHierarchy binary, command
      args/data files, and other hierarchy files so that the command re-runs
      when one changes.
      
      Drop unnecessary shell escaping workarounds.  Drop extra target-level
      dependencies that are implied by linking since the switch to using
      ${vtk-module}_LINK_DEPENDS to construct the list of hierarchy files from
      dependencies.
      
      When building with the CMake Ninja generator, work around an apparent
      limitation by exposing the real hierarchy file as an output of the
      custom command.
      
      Change-Id: I8bda94e5a40d89ff6758d3a0c44a723f18e94f58
      d3155f9b
    • Marcus D. Hanwell's avatar
      Merge topic 'python-install-rules' into master · e62bff86
      Marcus D. Hanwell authored
      7f7586e4 Removed vtk.qt - Qt 3 is not supported in VTK
      e62bff86
    • Marcus D. Hanwell's avatar
      These should be appending the WRAP_HINTS to the vars · ed0d4e81
      Marcus D. Hanwell authored
      The previous version would have caused bugs when there was a custom
      hints file and some CMake code to export.
      
      Change-Id: Ie33b73be4505c0f483f4f2d9727cce744fee1005
      ed0d4e81
    • Marcus D. Hanwell's avatar
      Fixed copy/paste error - WRAP_HINTS install path · e5323fc7
      Marcus D. Hanwell authored
      Thanks to Utkarsh for spotting the error, we need a path for the build
      tree and a path for the install tree for any custom hints file.
      
      Change-Id: I57b49a7a91da75286136652fdb65d89b54b15217
      e5323fc7
  4. 03 Apr, 2013 8 commits
  5. 02 Apr, 2013 4 commits
    • Andrew Bauer's avatar
      Fixing the interior check tolerance for the apex of vtkPyramid. · 2704cf30
      Andrew Bauer authored
      I was using a tolerance of 0.001 near the apex of the pyramid
      relative to a distance squared for the interior check but elsewhere
      I was doing a tolerance of 0.001 for the absolute value of
      the distance so I squared the 0.001 tolerance to be consistent
      with the interior check for the other parts of the cell.
      Note that due to the degenerate nature of the pyramid cell we
      do a specialized interior check near the apex.
      Thanks to Kathleen S. Biagas for the bug report and fix.
      
      Change-Id: I7580fa04539b159ceac12385e2ac3d795906dc01
      2704cf30
    • Sean McBride's avatar
      Merge topic 'misc-warnings' into master · c6195a3a
      Sean McBride authored
      3e275cfd Replaced invalid casts with memcpy
      a38c3e45 Moved and renamed macros from .cxx to .h
      32dcb78d Replaced invalid casts with memcpy
      5d9d895b Removed dead code in private tableVert and tableDeg classes
      931fc218 Moved ROUND_SIZE macro into '#ifdef __CUDACC__' condition
      9d8ebea8 Removed unused NMAX macro (constant)
      7184f767 Removed unused TEST macro
      40201954 Removed unused sign macro
      0368f481 Removed unused VTK_CREATE macro
      9bb5e01f Removed unused vtkVRCMultiplyViewPointMacro macro
      71c5784e Removed unused vtkStackedMIN and vtkStackedMAX macros
      404c387f Removed unused min and max macros
      2c121cee Removed unused MIN and MAX macros
      44d6c749 Removed unused MY_MIN and MY_MAX macros
      b34d99c9 Removed unused vtkTTFEQUAL macro
      e3b4dcfa Removed unused macros
      ...
      c6195a3a
    • Sean McBride's avatar
      Merge topic 'missing-VTK_LEGACY' into master · 44fac21d
      Sean McBride authored
      b78f8054 Put GetPixelInformation() variant in VTK_LEGACY
      6f8741a8 Stop using deprecated variant of GetPixelInformation
      4049603d Put SetScalars() in VTK_LEGACY
      ac24b781 Put RenderString() in VTK_LEGACY
      5c29b2ca Wrapped deprecated constants in #ifndef VTK_LEGACY_REMOVE
      44fac21d
    • Berk Geveci's avatar
      Merge topic 'vtk-id-rename' into master · 0edc83c4
      Berk Geveci authored
      9c5c2a16 Replaced all "VTK_LARGE_ID" with "VTK_ID_MAX"
      35c44ca1 Replaced "-VTK_LARGE_ID-1" with "VTK_ID_MIN"
      a69493b5 Added VTK_ID_MIN and VTK_ID_MAX constants
      0edc83c4
  6. 01 Apr, 2013 10 commits