Commit 3ef54654 authored by Ken Martin's avatar Ken Martin
Browse files

merges from the main tree

parent 26099c2a
......@@ -70,7 +70,7 @@ const int vtkParallelRenderManager::REN_INFO_DOUBLE_SIZE =
const int vtkParallelRenderManager::LIGHT_INFO_DOUBLE_SIZE =
sizeof(vtkParallelRenderManager::LightInfoDouble)/sizeof(double);
vtkCxxRevisionMacro(vtkParallelRenderManager, "1.29");
vtkCxxRevisionMacro(vtkParallelRenderManager, "1.29.2.1");
vtkParallelRenderManager::vtkParallelRenderManager()
{
......@@ -538,7 +538,15 @@ void vtkParallelRenderManager::StartRender()
int numProcs = this->Controller->GetNumberOfProcesses();
// Make adjustments for window size.
int *size = this->RenderWindow->GetSize();
int *tilesize = this->RenderWindow->GetSize();
// To me, it seems dangerous for RenderWindow to return a size bigger
// than it actually supports or for GetSize to not return the same values
// as SetSize. Yet this is the case when tile rendering is established
// in RenderWindow. Correct for this.
int size[2];
int *tilescale;
tilescale = this->RenderWindow->GetTileScale();
size[0] = tilesize[0]/tilescale[0]; size[1] = tilesize[1]/tilescale[1];
if ((size[0] == 0) || (size[1] == 0))
{
// It helps to have a real window size.
......
......@@ -19,7 +19,7 @@
#include <math.h>
vtkCxxRevisionMacro(vtkVolumeRayCastMIPFunction, "1.30");
vtkCxxRevisionMacro(vtkVolumeRayCastMIPFunction, "1.30.6.1");
vtkStandardNewMacro(vtkVolumeRayCastMIPFunction);
// This is the templated function that actually casts a ray and computes
......@@ -167,7 +167,7 @@ void vtkCastMaxScalarValueRay( T *data_ptr, vtkVolumeRayCastDynamicInfo *dynamic
G = *(dptr + Ginc);
H = *(dptr + Hinc);
memcpy( prev_voxel, voxel, 3*sizeof(float) );
memcpy( prev_voxel, voxel, 3*sizeof(int) );
}
// Compute our offset in the voxel, and use that to trilinearly
......
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