Commit cdcc0b3f authored by Sean McBride's avatar Sean McBride
Browse files

COMP: fixed some 64 to 32 bit conversion warnings

parent 038f749c
......@@ -122,9 +122,9 @@ public:
// information.)
//BTX
unsigned long AddObserver(unsigned long event, vtkCommand *,
float priority=0.0);
float priority=0.0f);
unsigned long AddObserver(const char *event, vtkCommand *,
float priority=0.0);
float priority=0.0f);
vtkCommand *GetCommand(unsigned long tag);
void RemoveObserver(vtkCommand*);
void RemoveObservers(unsigned long event, vtkCommand *);
......
......@@ -19,10 +19,10 @@
#include <vtksys/ios/sstream>
vtkCxxRevisionMacro(vtkInteractorEventRecorder, "1.14");
vtkCxxRevisionMacro(vtkInteractorEventRecorder, "1.15");
vtkStandardNewMacro(vtkInteractorEventRecorder);
float vtkInteractorEventRecorder::StreamVersion = 1.0;
float vtkInteractorEventRecorder::StreamVersion = 1.0f;
//----------------------------------------------------------------------------
vtkInteractorEventRecorder::vtkInteractorEventRecorder()
......@@ -197,7 +197,7 @@ void vtkInteractorEventRecorder::Play()
// Read events and invoke them on the object in question
char event[128], keySym[64], buffer[512];
int pos[2], ctrlKey, shiftKey, keyCode, repeatCount;
float stream_version = 0.0, tempf;
float stream_version = 0.0f, tempf;
while ( ! this->InputStream->eof() )
{
......
......@@ -21,7 +21,7 @@
#include "vtkRenderWindowInteractor.h"
#include "vtkObserverMediator.h"
vtkCxxRevisionMacro(vtkInteractorObserver, "1.36");
vtkCxxRevisionMacro(vtkInteractorObserver, "1.37");
vtkCxxSetObjectMacro(vtkInteractorObserver,DefaultRenderer,vtkRenderer);
......@@ -44,7 +44,7 @@ vtkInteractorObserver::vtkInteractorObserver()
this->CurrentRenderer = NULL;
this->DefaultRenderer = NULL;
this->Priority = 0.0;
this->Priority = 0.0f;
this->KeyPressActivation = 1;
this->KeyPressActivationValue = 'i';
......
......@@ -24,14 +24,14 @@
#include <math.h>
#ifndef VTK_IMPLEMENT_MESA_CXX
vtkCxxRevisionMacro(vtkOpenGLActor, "1.30");
vtkCxxRevisionMacro(vtkOpenGLActor, "1.31");
vtkStandardNewMacro(vtkOpenGLActor);
#endif
// Actual actor render method.
void vtkOpenGLActor::Render(vtkRenderer *ren, vtkMapper *mapper)
{
float opacity;
double opacity;
// get opacity
opacity = this->GetProperty()->GetOpacity();
......
......@@ -23,7 +23,7 @@
#include "vtkRendererCollection.h"
#include "vtkTransform.h"
vtkCxxRevisionMacro(vtkRenderWindow, "1.154");
vtkCxxRevisionMacro(vtkRenderWindow, "1.155");
//----------------------------------------------------------------------------
// Needed when we don't use the vtkStandardNewMacro.
......@@ -68,7 +68,7 @@ vtkRenderWindow::vtkRenderWindow()
this->Renderers = vtkRendererCollection::New();
this->NumberOfLayers = 1;
this->CurrentCursor = VTK_CURSOR_DEFAULT;
this->AnaglyphColorSaturation = 0.65;
this->AnaglyphColorSaturation = 0.65f;
this->AnaglyphColorMask[0] = 4; // red
this->AnaglyphColorMask[1] = 3; // cyan
this->PainterDeviceAdapter = vtkPainterDeviceAdapter::New();
......
......@@ -18,7 +18,7 @@
#include "vtkTextProperty.h"
#include "vtkToolkits.h"
vtkCxxRevisionMacro(vtkTextMapper, "1.55");
vtkCxxRevisionMacro(vtkTextMapper, "1.56");
//----------------------------------------------------------------------------
// Needed when we don't use the vtkStandardNewMacro.
......@@ -266,7 +266,7 @@ int vtkTextMapper::SetRelativeFontSize(vtkTextMapper *tmapper,
vtkViewport *viewport, int *targetSize,
int *stringSize, float sizeFactor)
{
sizeFactor = (sizeFactor <= 0.0 ? 0.015 : sizeFactor);
sizeFactor = (sizeFactor <= 0.0f ? 0.015f : sizeFactor);
int fontSize, targetWidth, targetHeight;
// Find the best size for the font
......@@ -460,7 +460,7 @@ void vtkTextMapper::GetMultiLineSize(vtkViewport* viewport, int size[2])
void vtkTextMapper::RenderOverlayMultipleLines(vtkViewport *viewport,
vtkActor2D *actor)
{
float offset = 0.0;
float offset = 0.0f;
int size[2];
// make sure LineSize is up to date
this->GetMultiLineSize(viewport,size);
......@@ -475,13 +475,13 @@ void vtkTextMapper::RenderOverlayMultipleLines(vtkViewport *viewport,
switch (tprop->GetVerticalJustification())
{
case VTK_TEXT_TOP:
offset = 0.0;
offset = 0.0f;
break;
case VTK_TEXT_CENTERED:
offset = (-this->NumberOfLines + 1.0) / 2.0;
offset = (-this->NumberOfLines + 1.0f) / 2.0f;
break;
case VTK_TEXT_BOTTOM:
offset = -this->NumberOfLines + 1.0;
offset = -this->NumberOfLines + 1.0f;
break;
}
......
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