OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0026511: Build fails with VTK 6.3rc1

Browse Source 
Obsolete typedef "vtkFloatingPointType" is replaced by "double" in VIS and DRAW
This commit is contained in:
abv 2016-01-14 08:34:44 +03:00
parent c5a10cf717
commit 5ca413ce63
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/IVtkTools/IVtkTools_ShapePicker.cxx
View File

@ -73,15 +73,15 @@ float IVtkTools_ShapePicker::GetTolerance( ) const
// Method: convertDisplayToWorld // Method: convertDisplayToWorld
// Purpose: Convert display coordinates to world coordinates // Purpose: Convert display coordinates to world coordinates
//============================================================================ //============================================================================
bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer, bool IVtkTools_ShapePicker::convertDisplayToWorld (vtkRenderer *theRenderer,
vtkFloatingPointType theDisplayCoord[3], double theDisplayCoord[3],
vtkFloatingPointType theWorldCoord[3]) double theWorldCoord[3])
{ {
// Convert the selection point into world coordinates. // Convert the selection point into world coordinates.
theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], theDisplayCoord[2]); theRenderer->SetDisplayPoint (theDisplayCoord[0], theDisplayCoord[1], theDisplayCoord[2]);
theRenderer->DisplayToWorld(); theRenderer->DisplayToWorld();
vtkFloatingPointType* const aCoords = theRenderer->GetWorldPoint(); double* const aCoords = theRenderer->GetWorldPoint();
if (aCoords[3] == 0.0) if (aCoords[3] == 0.0)
{ {
return false; return false;

4
src/IVtkTools/IVtkTools_ShapePicker.hxx
View File

@ -124,8 +124,8 @@ protected:
//! Convert display coordinates to world coordinates //! Convert display coordinates to world coordinates
static bool convertDisplayToWorld (vtkRenderer *theRenderer, static bool convertDisplayToWorld (vtkRenderer *theRenderer,
vtkFloatingPointType theDisplayCoord[3], double theDisplayCoord[3],
vtkFloatingPointType theWorldCoord[3] ); double theWorldCoord[3] );
private: // not copyable private: // not copyable
IVtkTools_ShapePicker (const IVtkTools_ShapePicker&); IVtkTools_ShapePicker (const IVtkTools_ShapePicker&);

2
src/IVtkVTK/IVtkVTK_View.cxx
View File

@ -151,7 +151,7 @@ bool IVtkVTK_View::DisplayToWorld (const gp_XY& theDisplayPnt, gp_XYZ& theWorldP
myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0); myRenderer->SetDisplayPoint (theDisplayPnt.X(), theDisplayPnt.Y(), 0.0);
myRenderer->DisplayToWorld(); myRenderer->DisplayToWorld();
vtkFloatingPointType* const aCoords = myRenderer->GetWorldPoint(); double* const aCoords = myRenderer->GetWorldPoint();
if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates if (aCoords[3] == 0.0) // Point at infinity in homogeneous coordinates
{ {
return false; return false;