config_files/patches/vtk-4.2.6-gcc-4.1.patch

   1 diff -Naur --exclude=CVS VTK-4.2.6/IO/vtkBMPReader.cxx VTK-4.2.6-patched/IO/vtkBMPReader.cxx
   2 --- VTK-4.2.6/IO/vtkBMPReader.cxx       2003-02-25 19:59:24.000000000 +0300
   3 +++ VTK-4.2.6-patched/IO/vtkBMPReader.cxx       2007-04-11 18:59:41.000000000 +0400
   4 @@ -504,11 +504,11 @@
   5          outPtr0 += outIncr[0];
   6          }
   7        // move to the next row in the file and data
   8 -      self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg);
   9 +      self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg);
  10        outPtr1 += outIncr[1];
  11        }
  12      // move to the next image in the file and data
  13 -    self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg);
  14 +    self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1, ios::beg);
  15      outPtr2 += outIncr[2];
  16      }
  17
  18 diff -Naur --exclude=CVS VTK-4.2.6/IO/vtkImageReader.cxx VTK-4.2.6-patched/IO/vtkImageReader.cxx
  19 --- VTK-4.2.6/IO/vtkImageReader.cxx     2002-12-26 21:18:50.000000000 +0300
  20 +++ VTK-4.2.6-patched/IO/vtkImageReader.cxx     2007-04-11 18:59:56.000000000 +0400
  21 @@ -366,7 +366,7 @@
  22        // if that happens, store the value in correction and apply later
  23        if (filePos + streamSkip0 >= 0)
  24          {
  25 -        self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg);
  26 +        self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg);
  27          correction = 0;
  28          }
  29        else
  30 @@ -376,7 +376,7 @@
  31        outPtr1 += outIncr[1];
  32        }
  33      // move to the next image in the file and data
  34 -    self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction,
  35 +    self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1 + correction,
  36                        ios::beg);
  37      outPtr2 += outIncr[2];
  38      }
  39 diff -Naur --exclude=CVS VTK-4.2.6/Rendering/vtkVolumeRayCastMapper.cxx VTK-4.2.6-patched/Rendering/vtkVolumeRayCastMapper.cxx
  40 --- VTK-4.2.6/Rendering/vtkVolumeRayCastMapper.cxx      2002-12-26 21:20:41.000000000 +0300
  41 +++ VTK-4.2.6-patched/Rendering/vtkVolumeRayCastMapper.cxx      2007-04-11 19:38:35.000000000 +0400
  42 @@ -65,6 +65,8 @@
  43    B[1] = A[0]*M[1]  + A[1]*M[5]  + A[2]*M[9]; \
  44    B[2] = A[0]*M[2]  + A[1]*M[6]  + A[2]*M[10]
  45
  46 +VTK_THREAD_RETURN_TYPE VolumeRayCastMapper_CastRays( void *arg );
  47 +
  48  vtkVolumeRayCastMapper* vtkVolumeRayCastMapper::New()
  49  {
  50    // First try to create the object from the vtkObjectFactory
  51 diff -Naur --exclude=CVS VTK-4.2.6/Rendering/vtkXRenderWindowInteractor.cxx VTK-4.2.6-patched/Rendering/vtkXRenderWindowInteractor.cxx
  52 --- VTK-4.2.6/Rendering/vtkXRenderWindowInteractor.cxx  2002-11-22 19:25:58.000000000 +0300
  53 +++ VTK-4.2.6-patched/Rendering/vtkXRenderWindowInteractor.cxx  2007-04-12 10:01:02.000000000 +0400
  54 @@ -33,6 +33,11 @@
  55  vtkCxxRevisionMacro(vtkXRenderWindowInteractor, "$Revision$");
  56  vtkStandardNewMacro(vtkXRenderWindowInteractor);
  57
  58 +void vtkXRenderWindowInteractorCallback(Widget vtkNotUsed(w),
  59 +                                        XtPointer client_data,
  60 +                                        XEvent *event,
  61 +                                        Boolean *vtkNotUsed(ctd));
  62 +
  63  typedef struct
  64  {
  65    Visual        *visual;
  66 diff -Naur --exclude=CVS VTK-4.2.6/Rendering/vtkXRenderWindowTclInteractor.cxx VTK-4.2.6-patched/Rendering/vtkXRenderWindowTclInteractor.cxx
  67 --- VTK-4.2.6/Rendering/vtkXRenderWindowTclInteractor.cxx       2002-07-17 19:36:18.000000000 +0400
  68 +++ VTK-4.2.6-patched/Rendering/vtkXRenderWindowTclInteractor.cxx       2007-04-12 10:15:48.000000000 +0400
  69 @@ -34,6 +34,12 @@
  70  vtkCxxRevisionMacro(vtkXRenderWindowTclInteractor, "$Revision$");
  71  vtkStandardNewMacro(vtkXRenderWindowTclInteractor);
  72
  73 +void vtkXRenderWindowTclInteractorCallback(Widget vtkNotUsed(w),
  74 +                                          XtPointer client_data,
  75 +                                           XEvent *event,
  76 +                                           Boolean *vtkNotUsed(ctd));
  77 +void vtkXRenderWindowTclInteractorTimer(XtPointer,XtIntervalId *);
  78 +
  79  // steal the first three elements of the TkMainInfo stuct
  80  // we don't care about the rest of the elements.
  81  struct TkMainInfo