Changeset 3583


Ignore:
Timestamp:
Mar 25, 2013 6:00:23 PM (9 years ago)
Author:
ldelgass
Message:

Cherry-pick a few fixes from VTK head to allowing compiling against VTK head.

Location:
trunk/packages/vizservers/vtkvis
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/vtkvis/vtkRpCubeAxesActor.cpp

    r3549 r3583  
    25452545{
    25462546  // Loop over points and find the closest point to the camera
    2547   double min = VTK_LARGE_FLOAT;
     2547  double min = VTK_FLOAT_MAX;
    25482548  int idx = 0;
    25492549  for (int i=0; i < 8; i++)
     
    25622562{
    25632563  // Loop over points and find the furthest point from the camera
    2564   double max = -VTK_LARGE_FLOAT;
     2564  double max = -VTK_FLOAT_MAX;
    25652565  int idx = 0;
    25662566  for (int i=0; i < 8; i++)
     
    25872587
    25882588   // Find distance to origin
    2589    double d2Min = VTK_LARGE_FLOAT;
     2589   double d2Min = VTK_FLOAT_MAX;
    25902590   for (i=0; i < 8; i++)
    25912591     {
     
    26002600   // find minimum slope point connected to closest point and on
    26012601   // right side (in projected coordinates). This is the first edge.
    2602    minSlope = VTK_LARGE_FLOAT;
     2602   minSlope = VTK_FLOAT_MAX;
    26032603   for (xIdx=0, i=0; i<3; i++)
    26042604     {
  • trunk/packages/vizservers/vtkvis/vtkRpCubeAxesActor.h

    r3479 r3583  
    199199  // many renders) the axes can switch position (jump from one axes
    200200  // to another).
    201   vtkSetClampMacro(Inertia, int, 1, VTK_LARGE_INTEGER);
     201  vtkSetClampMacro(Inertia, int, 1, VTK_INT_MAX);
    202202  vtkGetMacro(Inertia, int);
    203203
Note: See TracChangeset for help on using the changeset viewer.