Removed vc2010 warnings

diff --git a/vv/vvImageReader.cxx b/vv/vvImageReader.cxx
index 8bbdf251b57355a40b466065e913596e6ec0d7b9..1f33fc72b2abe997ff119adf7f90b156edc7b0e7 100644 (file)
--- a/vv/vvImageReader.cxx
+++ b/vv/vvImageReader.cxx
@@ -124,28 +124,34 @@ void vvImageReader::SetInputFilenames(const std::vector<std::string> & filenames
 //Read transformation in NKI format (Xdr, transposed, cm)
 void vvImageReader::ReadNkiImageTransform()
 {
-  bool bRead=true;
-  typedef itk::ImageFileReader< itk::Image< double, 2 > > MatrixReaderType;
-  MatrixReaderType::Pointer readerTransfo = MatrixReaderType::New();
-  readerTransfo->SetFileName(mInputFilenames[0]+".MACHINEORIENTATION");
-  try {
-    readerTransfo->Update();
-  } catch( itk::ExceptionObject & err ) {
-    bRead=false;
-  }
-
-  if (bRead) {
-    //Transpose matrix (NKI format)
-    for(int j=0; j<4; j++)
-      for(int i=0; i<4; i++)
-        mImage->GetTransform()->GetMatrix()->SetElement(j,i,readerTransfo->GetOutput()->GetBufferPointer()[4*i+j]);
-
-    //From cm to mm
-    for(int i=0; i<3; i++)
-      mImage->GetTransform()->GetMatrix()->SetElement(i,3,10*mImage->GetTransform()->GetMatrix()->GetElement(i,3));
-
-    mImage->GetTransform()->Inverse();
-    mImage->UpdateReslice();
+  bool bRead=false;
+  std::string filename = mInputFilenames[0]+".MACHINEORIENTATION";
+  if(itksys::SystemTools::FileExists(filename.c_str())){
+    typedef itk::ImageFileReader< itk::Image< double, 2 > > MatrixReaderType;
+    MatrixReaderType::Pointer readerTransfo = MatrixReaderType::New();
+    readerTransfo->SetFileName(filename);
+    try {
+      bRead = true;
+      readerTransfo->Update();
+    } catch( itk::ExceptionObject & err ) {
+      bRead=false;
+      std::cerr << "Cannot read " << filename << std::endl
+                << "The error is: " << err << std::endl;
+    }
+
+    if (bRead) {
+      //Transpose matrix (NKI format)
+      for(int j=0; j<4; j++)
+        for(int i=0; i<4; i++)
+          mImage->GetTransform()->GetMatrix()->SetElement(j,i,readerTransfo->GetOutput()->GetBufferPointer()[4*i+j]);
+
+      //From cm to mm
+      for(int i=0; i<3; i++)
+        mImage->GetTransform()->GetMatrix()->SetElement(i,3,10*mImage->GetTransform()->GetMatrix()->GetElement(i,3));
+
+      mImage->GetTransform()->Inverse();
+      mImage->UpdateReslice();
+    }
   }
 }
 //------------------------------------------------------------------------------

diff --git a/vv/vvLabelImageLoaderWidget.cxx b/vv/vvLabelImageLoaderWidget.cxx
index 96636fa35b03940c1cc71e4b2e907a7f7fc68105..482d86b4c1453c9dcd712def7e709a0bfe8ec96d 100644 (file)
--- a/vv/vvLabelImageLoaderWidget.cxx
+++ b/vv/vvLabelImageLoaderWidget.cxx
@@ -114,7 +114,8 @@ void vvLabelImageLoaderWidget::OpenImage()
     m_Output->AddItkImage( reader->GetOutput() );
   }
   catch ( itk::ExceptionObject & err ) {
-    std::cerr << "Error while reading " << filename.toStdString() << std::endl;
+    std::cerr << "Error while reading " << filename.toStdString() << std::endl
+              << "The error is " << err << std::endl;
     QString error;
     error = QString("Cannot open file %1\n").arg(filename);
     QMessageBox::information(this,tr("Reading problem"),error);

diff --git a/vv/vvLandmarks.h b/vv/vvLandmarks.h
index 720445224f0c860bc8b5d2c2f72908913afe858c..eecf312699bc981baa057418c838975cc1025bfe 100644 (file)
--- a/vv/vvLandmarks.h
+++ b/vv/vvLandmarks.h
@@ -47,9 +47,7 @@ public :
     float* GetCoordinates(int index);
     double GetPixelValue(int index);
     std::string GetComments(int index);
-    int GetNumberOfPoints() {
-        return mLandmarks.size();
-    }
+    unsigned int GetNumberOfPoints() { return (unsigned int) mLandmarks.size(); }
     //int GetNumberOfSources(){return mText.size();}
 
     vtkPolyData* GetOutput() {

diff --git a/vv/vvMesh.h b/vv/vvMesh.h
index 9e4d16cadc23161de39b62e6248b1f3d4bcbec3e..27546d9cc5e3703ffe7b4befc57600f3cb52c879 100644 (file)
--- a/vv/vvMesh.h
+++ b/vv/vvMesh.h
@@ -47,12 +47,12 @@ public:
     void AddMesh(vtkPolyData* p);
     ///Removes all meshes in the object
     void RemoveMeshes();
-    unsigned int GetNumberOfMeshes() { return meshes.size(); }
+    unsigned int GetNumberOfMeshes() { return (unsigned int)meshes.size(); }
 
     vtkImageData* GetMask(unsigned int i) const {return masks[i];}
     void AddMask(vtkImageData* im);
     void RemoveMasks();
-    unsigned int GetNumberOfMasks() { return masks.size(); }
+    unsigned int GetNumberOfMasks() { return (unsigned int)masks.size(); }
 
     ///Pretty-print information about the mesh
     void Print() const;

diff --git a/vv/vvSlicer.h b/vv/vvSlicer.h
index 3ccf8effcdb4e49206e577620255b4361ef2e0b5..d4ac4dcae2428aafc905a0a5da444106c744e82b 100644 (file)
--- a/vv/vvSlicer.h
+++ b/vv/vvSlicer.h
@@ -97,7 +97,7 @@ public:
     ///Reimplemented from vtkImageViewer2 to add polydata support
     void SetSlice(int s);
     int GetTMax() {
-        return mImage->GetVTKImages().size() - 1;
+        return (unsigned int)mImage->GetVTKImages().size() - 1;
     }
 
     void SetOpacity(double s);

diff --git a/vv/vvSurfaceViewerDialog.cxx b/vv/vvSurfaceViewerDialog.cxx
index d39ad253f08c30d6a902721784cbdfe41cd4b331..638e8f2a5ee86363b6cb810fd56085906c3df5f5 100644 (file)
--- a/vv/vvSurfaceViewerDialog.cxx
+++ b/vv/vvSurfaceViewerDialog.cxx
@@ -149,7 +149,7 @@ void vvSurfaceViewerDialog::PreviousTime()
 {
   mCurrentTime--;
   if (mCurrentTime < 0)
-    mCurrentTime = mReaders.size() - 1;
+    mCurrentTime = (unsigned int) mReaders.size() - 1;
   mMapper->SetInput(mReaders[mCurrentTime]->GetOutput());
   mMapper->Modified();
   renderWidget->GetRenderWindow()->Render();