Merge pull request #188 from Chaircrusher/DoubleConversionFixes

BUG: Compile errors w/packages turned off by default.
BRAINSia · Feb 7, 2013 · 4134c36 · 4134c36
2 parents 6092be5 + 194efaa
commit 4134c36
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/BRAINSSurfaceTools/BRAINSSurfaceCommon/itkQuadEdgeMeshVectorDataVTKPolyDataWriter.hxx b/BRAINSSurfaceTools/BRAINSSurfaceCommon/itkQuadEdgeMeshVectorDataVTKPolyDataWriter.hxx
@@ -94,7 +94,11 @@ QuadEdgeMeshVectorDataVTKPolyDataWriter<TMesh>
         CellType* cellPointer = it.Value();
         if( cellPointer->GetType() != 1 )
           {
-          outputFile << doubleToString(c_it.Value());
+          for(unsigned _i = 0; _i < c_it.Value().Size(); ++_i)
+            {
+            outputFile << doubleToString(c_it.Value()[_i]);
+            if(_i < 2) { outputFile << " "; }
+            }
           if( k++ % 3 == 0 )
             {
             outputFile <<std::endl;

diff --git a/BRAINSSurfaceTools/BRAINSSurfaceGeneration/BRAINSMeasureSurface.cxx b/BRAINSSurfaceTools/BRAINSSurfaceGeneration/BRAINSMeasureSurface.cxx
@@ -274,7 +274,7 @@ int main( int argc, char **argv )
 
       csvfile << ", " << doubleToString(sulcalArea->GetValue(i));
       csvfile << ", " << doubleToString(sulcalThickness->GetValue(i));
-      csvfile << ", " << doubleToString(sulcalCurvature->GetValue(i) << std::endl);
+      csvfile << ", " << doubleToString(sulcalCurvature->GetValue(i)) << std::endl;
       }
 
     csvfile.close();

diff --git a/BRAINSSurfaceTools/BRAINSSurfaceGeneration/CMakeLists.txt b/BRAINSSurfaceTools/BRAINSSurfaceGeneration/CMakeLists.txt
@@ -10,11 +10,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 StandardBRAINSBuildMacro(NAME BRAINSApplySurfaceLabels TARGET_LIBRARIES ${ITK_LIBRARIES} ${VTK_LIBRARIES})
 
-StandardBRAINSBuildMacro(NAME BRAINSMeasureSurface TARGET_LIBRARIES ${ITK_LIBRARIES} ${VTK_LIBRARIES} )
+StandardBRAINSBuildMacro(NAME BRAINSMeasureSurface TARGET_LIBRARIES BRAINSCommonLib ${VTK_LIBRARIES} )
 
 StandardBRAINSBuildMacro(NAME BRAINSSurfaceGeneration
 ADDITIONAL_SRCS vtkITKArchetypeImageSeriesReader.cxx vtkITKArchetypeImageSeriesScalarReader.cxx
-TARGET_LIBRARIES ${ITK_LIBRARIES} ${VTK_LIBRARIES} )
+TARGET_LIBRARIES BRAINSCommonLib ${ITK_LIBRARIES} ${VTK_LIBRARIES} )
 
 if (BUILD_TESTING)
 

diff --git a/BRAINSSurfaceTools/BRAINSSurfaceRegister/MultiResolutionRegistration/CMakeLists.txt b/BRAINSSurfaceTools/BRAINSSurfaceRegister/MultiResolutionRegistration/CMakeLists.txt
@@ -1,4 +1,4 @@
-StandardBRAINSBuildMacro(NAME MultiResolutionRegistration TARGET_LIBRARIES ${ITK_LIBRARIES})
+StandardBRAINSBuildMacro(NAME MultiResolutionRegistration TARGET_LIBRARIES BRAINSCommonLib )
 
 if (BUILD_TESTING)