From f7f750ef19f24c8277e295e3e166489b95b6ff41 Mon Sep 17 00:00:00 2001 From: stv Date: Tue, 21 Feb 2006 14:58:30 +0000 Subject: [PATCH] no message --- src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx | 10 +++++++--- src/VTKViewer/VTKViewer_GeometryFilter.cxx | 7 +++++-- src/VTKViewer/VTKViewer_RectPicker.cxx | 7 +++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx index 19672b782..0aef6c3a1 100755 --- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx +++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx @@ -80,9 +80,13 @@ void VTKViewer_ExtractUnstructuredGrid::SetStoreMapping(int theStoreMapping){ this->Modified(); } -vtkIdType VTKViewer_ExtractUnstructuredGrid::GetInputId(int theOutId) const{ - if(myCellIds.empty() && myCellTypes.empty()) return theOutId; - if(myOut2InId.empty() || theOutId > myOut2InId.size()) return -1; +vtkIdType VTKViewer_ExtractUnstructuredGrid::GetInputId(int theOutId) const +{ + if ( myCellIds.empty() && myCellTypes.empty() ) + return theOutId; + + if ( myOut2InId.empty() || theOutId > (int)myOut2InId.size() ) + return -1; #if defined __GNUC_2__ return myOut2InId[theOutId]; #else diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx index df096cf7a..37a9dda64 100755 --- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx +++ b/src/VTKViewer/VTKViewer_GeometryFilter.cxx @@ -1110,8 +1110,11 @@ VTKViewer_GeometryFilter //---------------------------------------------------------------------------- -vtkIdType VTKViewer_GeometryFilter::GetElemObjId(int theVtkID){ - if(myVTK2ObjIds.empty() || theVtkID > myVTK2ObjIds.size()) return -1; +vtkIdType VTKViewer_GeometryFilter::GetElemObjId(int theVtkID) +{ + if ( myVTK2ObjIds.empty() || theVtkID > (int)myVTK2ObjIds.size() ) + return -1; + #if defined __GNUC_2__ return myVTK2ObjIds[theVtkID]; #else diff --git a/src/VTKViewer/VTKViewer_RectPicker.cxx b/src/VTKViewer/VTKViewer_RectPicker.cxx index 698a54b3e..f0a00caaa 100755 --- a/src/VTKViewer/VTKViewer_RectPicker.cxx +++ b/src/VTKViewer/VTKViewer_RectPicker.cxx @@ -76,7 +76,7 @@ int VTKViewer_RectPicker::Pick(float selectionX1, float selectionY1, float selec float c1[3], c2[3]; int picked=0; int *winSize; - float x, y, t, p; + float x, y, t; float *viewport; float cameraPos[4], cameraFP[4]; float *displayCoords, *worldCoords; @@ -88,7 +88,6 @@ int VTKViewer_RectPicker::Pick(float selectionX1, float selectionY1, float selec float windowLowerLeft[4], windowUpperRight[4]; float bounds[6], tol; float tF, tB; - float hitPosition[3]; float cameraDOP[3]; // Initialize picking process @@ -730,9 +729,9 @@ char VTKViewer_RectPicker::HitBBox (float bounds[6], float origin[4][4], float d * p2[4][4] is the corner points of bottom face. * \retval The method returns a non-zero value, if the point is inside. */ -char VTKViewer_RectPicker::PointInside (float p[3], float p1[4][4], float p2[4][4], float tol) +char VTKViewer_RectPicker::PointInside(float p[3], float p1[4][4], float p2[4][4], float tol) { - int i, j, k; + int j, k; float t, coord[3]; // Fix one coordinate (x, for example) and -- 2.39.2