Commit adb1bde9 authored by John Biddiscombe's avatar John Biddiscombe

FIX: Applying a patch supplied by Rudolf Seemann to fix build problems on recent nightlies (GCC)

Also adding a couple of extra CxxRevisionMacros to shut up the compiler on (VS 7.1 .NET)
Still not part of main build. Completely untested.
parent db75cd83
......@@ -12,7 +12,7 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkShearWarpBase.h"
//#include "vtkShearWarpBase.h"
#define VTK_X_AXIS 0
#define VTK_Y_AXIS 1
......@@ -550,7 +550,7 @@ private:
};
// Base class for encoded volume
class vtkShearWarpBase
class vtkShearWarpBase : public vtkObjectBase
{
public:
vtkShearWarpBase()
......@@ -563,6 +563,7 @@ public:
virtual ~vtkShearWarpBase()
{
};
vtkTypeRevisionMacro(vtkShearWarpBase,vtkObjectBase);
// Returns the volume dimensions
int * GetDimensions()
......@@ -1023,7 +1024,6 @@ class VTK_RENDERING_EXPORT vtkShearWarpOctree : public vtkShearWarpBase
{
public:
vtkTypeRevisionMacro(vtkShearWarpOctree,vtkShearWarpBase);
void PrintSelf(ostream& os, vtkIndent indent);
vtkShearWarpOctree()
{
......
......@@ -13,6 +13,7 @@
=========================================================================*/
#include "vtkVolumeShearWarpMapper.h"
#include "vtkVolumeShearWarpDataStructure.h"
#include "vtkVolume.h"
#include "vtkRenderer.h"
......@@ -46,7 +47,10 @@
B[1] = A[0]*M[1] + A[1]*M[5] + A[2]*M[9]; \
B[2] = A[0]*M[2] + A[1]*M[6] + A[2]*M[10]
vtkCxxRevisionMacro(vtkVolumeShearWarpMapper, "1.4");
vtkCxxRevisionMacro(vtkVolumeShearWarpMapper, "1.5");
vtkCxxRevisionMacro(vtkShearWarpBase,"1.5");
vtkCxxRevisionMacro(vtkShearWarpOctree<unsigned char>,"1.5");
vtkCxxRevisionMacro(vtkShearWarpOctree<unsigned short>,"1.5");
//----------------------------------------------------------------------------
// Needed when we don't use the vtkStandardNewMacro.
......
......@@ -65,15 +65,15 @@ class vtkRenderWindow;
class vtkShearWarpPixelData;
class vtkShearWarpRLEImage;
struct vtkShearWarpVoxelData;
class vtkShearWarpRLERun;
class vtkShearWarpRLESlice;
template <class T> struct vtkShearWarpVoxelData;
template <class T> class vtkShearWarpRLERun;
template <class T> class vtkShearWarpRLESlice;
class vtkShearWarpBase;
class vtkShearWarpRLEVolume;
class vtkShearWarpSummedAreaTable;
template <class T> class vtkShearWarpRLEVolume;
template <class T> class vtkShearWarpSummedAreaTable;
struct vtkShearWarpOctreeRun;
class vtkShearWarpOctreeNode;
class vtkShearWarpOctree;
template <class T> class vtkShearWarpOctreeNode;
template <class T> class vtkShearWarpOctree;
#define VTK_X_AXIS 0
#define VTK_Y_AXIS 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment