Merge pull request #136 from InsightSoftwareConsortium/update-for-exceptions

thewtex · web-flow · commit 196059f46d01 · 2019-12-15T17:55:13.000-05:00
Update for exceptions
diff --git a/SoftwareGuide/Cover/Source/AntialiasFilter.cxx b/SoftwareGuide/Cover/Source/AntialiasFilter.cxx
@@ -78,7 +78,7 @@ int main( int argc, char ** argv )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & err )
+  catch( const itk::ExceptionObject & err )
     {
     std::cout << "ExceptionObject caught !" << std::endl;
     std::cout << err << std::endl;
diff --git a/SoftwareGuide/Cover/Source/BinaryMaskMedianFilter.cxx b/SoftwareGuide/Cover/Source/BinaryMaskMedianFilter.cxx
@@ -90,7 +90,7 @@ int main( int argc, char ** argv )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & err )
+  catch( const itk::ExceptionObject & err )
     {
     std::cout << "ExceptionObject caught !" << std::endl;
     std::cout << err << std::endl;
diff --git a/SoftwareGuide/Cover/Source/BinaryThresholdFilter.cxx b/SoftwareGuide/Cover/Source/BinaryThresholdFilter.cxx
@@ -42,7 +42,7 @@ int main(int argc, char * argv[] )
     {
     imageReader->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cerr << excp << std::endl;
     return -1;
@@ -66,7 +66,7 @@ int main(int argc, char * argv[] )
     {
     filter->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cerr << excp << std::endl;
     return -1;
@@ -83,7 +83,7 @@ int main(int argc, char * argv[] )
     {
     imageWriter->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cerr << excp << std::endl;
     return -1;
diff --git a/SoftwareGuide/Cover/Source/DilateFilter.cxx b/SoftwareGuide/Cover/Source/DilateFilter.cxx
@@ -91,7 +91,7 @@ int main( int argc, char ** argv )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & err )
+  catch( const itk::ExceptionObject & err )
     {
     std::cout << "ExceptionObject caught !" << std::endl;
     std::cout << err << std::endl;
diff --git a/SoftwareGuide/Cover/Source/ImageReadExtractWriteRGB.cxx b/SoftwareGuide/Cover/Source/ImageReadExtractWriteRGB.cxx
@@ -117,7 +117,7 @@ int main( int argc, char ** argv )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & err )
+  catch( const itk::ExceptionObject & err )
     {
     std::cout << "ExceptionObject caught !" << std::endl;
     std::cout << err << std::endl;
diff --git a/SoftwareGuide/Cover/Source/ModelBasedSegmentation.cxx b/SoftwareGuide/Cover/Source/ModelBasedSegmentation.cxx
@@ -395,7 +395,7 @@ int main( int argc, char *argv[] )
   try {
     registration->StartRegistration();
     }
-  catch( itk::ExceptionObject & exp ) {
+  catch( const itk::ExceptionObject & exp ) {
     std::cerr << "Exception caught ! " << std::endl;
     std::cerr << exp << std::endl;
     }
diff --git a/SoftwareGuide/Cover/Source/NegateFilter.cxx b/SoftwareGuide/Cover/Source/NegateFilter.cxx
@@ -113,7 +113,7 @@ int main( int argc, char ** argv )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & err )
+  catch( const itk::ExceptionObject & err )
     {
     std::cout << "ExceptionObject caught !" << std::endl;
     std::cout << err << std::endl;
diff --git a/SoftwareGuide/Cover/Source/RescaleIntensityFilter.cxx b/SoftwareGuide/Cover/Source/RescaleIntensityFilter.cxx
@@ -77,7 +77,7 @@ int main( int argc, char ** argv )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & err )
+  catch( const itk::ExceptionObject & err )
     {
     std::cout << "ExceptionObject caught !" << std::endl;
     std::cout << err << std::endl;
diff --git a/SoftwareGuide/Cover/Source/VWBlueRemoval.cxx b/SoftwareGuide/Cover/Source/VWBlueRemoval.cxx
@@ -32,7 +32,7 @@ int main(int argc, char * argv[] )
       {
       imageReader->Update();
       }
-    catch( itk::ExceptionObject & excp )
+    catch( const itk::ExceptionObject & excp )
       {
       std::cout << excp << std::endl;
       return -1;
@@ -98,7 +98,7 @@ int main(int argc, char * argv[] )
     {
     imageWriter->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cout << excp << std::endl;
     return -1;
diff --git a/SoftwareGuide/Cover/Source/VWColorSegmentation.cxx b/SoftwareGuide/Cover/Source/VWColorSegmentation.cxx
@@ -47,7 +47,7 @@ int main(int argc, char * argv[] )
     {
     imageReader->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cerr << excp << std::endl;
     return -1;
@@ -95,7 +95,7 @@ int main(int argc, char * argv[] )
     {
     confidenceFilter->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cerr << excp << std::endl;
     return -1;
@@ -112,7 +112,7 @@ int main(int argc, char * argv[] )
     {
     imageWriter->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch (const itk::ExceptionObject & excp )
     {
     std::cerr << excp << std::endl;
     return -1;
diff --git a/SoftwareGuide/Cover/Source/VWHistogramHSV.cxx b/SoftwareGuide/Cover/Source/VWHistogramHSV.cxx
@@ -90,7 +90,7 @@ int main(int argc, char * argv[] )
       {
       reader->Update();
       }
-    catch( itk::ExceptionObject & excp )
+    catch( const itk::ExceptionObject & excp )
       {
       std::cout << excp << std::endl;
       return -1;
@@ -199,7 +199,7 @@ int main(int argc, char * argv[] )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cout << excp << std::endl;
     return -1;
diff --git a/SoftwareGuide/Cover/Source/VWHistogramRGB.cxx b/SoftwareGuide/Cover/Source/VWHistogramRGB.cxx
@@ -38,7 +38,7 @@ int main(int argc, char * argv[] )
       {
       reader->Update();
       }
-    catch( itk::ExceptionObject & excp )
+    catch( const itk::ExceptionObject & excp )
       {
       std::cout << excp << std::endl;
       return -1;
@@ -99,7 +99,7 @@ int main(int argc, char * argv[] )
     {
     writer->Update();
     }
-  catch( itk::ExceptionObject & excp )
+  catch( const itk::ExceptionObject & excp )
     {
     std::cout << excp << std::endl;
     return -1;
diff --git a/SoftwareGuide/Latex/Appendices/CodingStyleGuide.tex b/SoftwareGuide/Latex/Appendices/CodingStyleGuide.tex
@@ -9,11 +9,14 @@ \chapter{Coding Style Guide}
 architectural and implementation decisions made early in the project. For
 example, the decision was made to implement ITK with a C++ core using
 principles of generic programming, so the rules are oriented towards this style
-of implementation. Some guidelines are relatively arbitrary, such as
-indentation levels and style. However, an attempt was made to find coding
-styles consistent with accepted practices. The point is to adhere to a common
+of implementation. All guidelines are strictly enforced, including whitespace
+indentation levels and style. Careful consideration and considerable discussion
+occurred in an attempt to find coding
+styles consistent with accepted practices in the active community.
+The primary goal is to adhere to a common
 style to assist community members of the future to learn, use, maintain, and
-extend ITK. A common style greatly improves readability.
+extend ITK. Given the fact that code is read many more times than it is written, a strong
+emphasis is placed on generating a common style that improves readability.
 
 Please do your best to be an outstanding member of the ITK community. The rules
 described here have been developed with the community as a whole in mind.
@@ -3193,11 +3196,11 @@ \section{Exception Handling}
   {
   // Code liable to throw an exception
   }
-catch( ExceptionObject & exc )
+catch( const ExceptionObject & exc )
   {
   std::cerr << exc << std::endl;
   }
-catch( std::exception & exc )
+catch( const std::exception & exc )
   {
   std::cerr << exc.what() << std::endl;
   }
@@ -3213,7 +3216,7 @@ \section{Exception Handling}
   m_ExceptionMessage = "";
   this->TestFileExistanceAndReadability();
   }
-catch( ExceptionObject & exc )
+catch( const ExceptionObject & exc )
   {
   m_ExceptionMessage = exc.GetDescription();
   }
@@ -3229,7 +3232,7 @@ \section{Exception Handling}
   {
   m_Optimizer->StartOptimization();
   }
-catch( ExceptionObject & exc )
+catch( const ExceptionObject & exc )
   {
   // An error has occurred in the optimization.
   // Update the parameters.
diff --git a/SoftwareGuide/Latex/Architecture/SystemOverview.tex b/SoftwareGuide/Latex/Architecture/SystemOverview.tex
@@ -292,7 +292,7 @@ \subsection{Error Handling and Exceptions}
     {
     //...try executing some code here...
     }
-  catch ( itk::ExceptionObject & exp )
+  catch( const itk::ExceptionObject & exp )
     {
     //...if an exception is thrown catch it here
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ int main( int argc, char ** argv )`
`78`	`78`	`{`
`79`	`79`	`writer->Update();`
`80`	`80`	`}`
`81`		`- catch( itk::ExceptionObject & err )`
	`81`	`+ catch( const itk::ExceptionObject & err )`
`82`	`82`	`{`
`83`	`83`	`std::cout << "ExceptionObject caught !" << std::endl;`
`84`	`84`	`std::cout << err << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ int main( int argc, char ** argv )`
`90`	`90`	`{`
`91`	`91`	`writer->Update();`
`92`	`92`	`}`
`93`		`- catch( itk::ExceptionObject & err )`
	`93`	`+ catch( const itk::ExceptionObject & err )`
`94`	`94`	`{`
`95`	`95`	`std::cout << "ExceptionObject caught !" << std::endl;`
`96`	`96`	`std::cout << err << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ int main(int argc, char * argv[] )`
`42`	`42`	`{`
`43`	`43`	`imageReader->Update();`
`44`	`44`	`}`
`45`		`- catch( itk::ExceptionObject & excp )`
	`45`	`+ catch( const itk::ExceptionObject & excp )`
`46`	`46`	`{`
`47`	`47`	`std::cerr << excp << std::endl;`
`48`	`48`	`return -1;`
`@@ -66,7 +66,7 @@ int main(int argc, char * argv[] )`
`66`	`66`	`{`
`67`	`67`	`filter->Update();`
`68`	`68`	`}`
`69`		`- catch( itk::ExceptionObject & excp )`
	`69`	`+ catch( const itk::ExceptionObject & excp )`
`70`	`70`	`{`
`71`	`71`	`std::cerr << excp << std::endl;`
`72`	`72`	`return -1;`
`@@ -83,7 +83,7 @@ int main(int argc, char * argv[] )`
`83`	`83`	`{`
`84`	`84`	`imageWriter->Update();`
`85`	`85`	`}`
`86`		`- catch( itk::ExceptionObject & excp )`
	`86`	`+ catch( const itk::ExceptionObject & excp )`
`87`	`87`	`{`
`88`	`88`	`std::cerr << excp << std::endl;`
`89`	`89`	`return -1;`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ int main( int argc, char ** argv )`
`91`	`91`	`{`
`92`	`92`	`writer->Update();`
`93`	`93`	`}`
`94`		`- catch( itk::ExceptionObject & err )`
	`94`	`+ catch( const itk::ExceptionObject & err )`
`95`	`95`	`{`
`96`	`96`	`std::cout << "ExceptionObject caught !" << std::endl;`
`97`	`97`	`std::cout << err << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ int main( int argc, char ** argv )`
`117`	`117`	`{`
`118`	`118`	`writer->Update();`
`119`	`119`	`}`
`120`		`- catch( itk::ExceptionObject & err )`
	`120`	`+ catch( const itk::ExceptionObject & err )`
`121`	`121`	`{`
`122`	`122`	`std::cout << "ExceptionObject caught !" << std::endl;`
`123`	`123`	`std::cout << err << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ int main( int argc, char *argv[] )`
`395`	`395`	`try {`
`396`	`396`	`registration->StartRegistration();`
`397`	`397`	`}`
`398`		`- catch( itk::ExceptionObject & exp ) {`
	`398`	`+ catch( const itk::ExceptionObject & exp ) {`
`399`	`399`	`std::cerr << "Exception caught ! " << std::endl;`
`400`	`400`	`std::cerr << exp << std::endl;`
`401`	`401`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ int main( int argc, char ** argv )`
`113`	`113`	`{`
`114`	`114`	`writer->Update();`
`115`	`115`	`}`
`116`		`- catch( itk::ExceptionObject & err )`
	`116`	`+ catch( const itk::ExceptionObject & err )`
`117`	`117`	`{`
`118`	`118`	`std::cout << "ExceptionObject caught !" << std::endl;`
`119`	`119`	`std::cout << err << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ int main( int argc, char ** argv )`
`77`	`77`	`{`
`78`	`78`	`writer->Update();`
`79`	`79`	`}`
`80`		`- catch( itk::ExceptionObject & err )`
	`80`	`+ catch( const itk::ExceptionObject & err )`
`81`	`81`	`{`
`82`	`82`	`std::cout << "ExceptionObject caught !" << std::endl;`
`83`	`83`	`std::cout << err << std::endl;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ int main(int argc, char * argv[] )`
`32`	`32`	`{`
`33`	`33`	`imageReader->Update();`
`34`	`34`	`}`
`35`		`- catch( itk::ExceptionObject & excp )`
	`35`	`+ catch( const itk::ExceptionObject & excp )`
`36`	`36`	`{`
`37`	`37`	`std::cout << excp << std::endl;`
`38`	`38`	`return -1;`
`@@ -98,7 +98,7 @@ int main(int argc, char * argv[] )`
`98`	`98`	`{`
`99`	`99`	`imageWriter->Update();`
`100`	`100`	`}`
`101`		`- catch( itk::ExceptionObject & excp )`
	`101`	`+ catch( const itk::ExceptionObject & excp )`
`102`	`102`	`{`
`103`	`103`	`std::cout << excp << std::endl;`
`104`	`104`	`return -1;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ int main(int argc, char * argv[] )`
`47`	`47`	`{`
`48`	`48`	`imageReader->Update();`
`49`	`49`	`}`
`50`		`- catch( itk::ExceptionObject & excp )`
	`50`	`+ catch( const itk::ExceptionObject & excp )`
`51`	`51`	`{`
`52`	`52`	`std::cerr << excp << std::endl;`
`53`	`53`	`return -1;`
`@@ -95,7 +95,7 @@ int main(int argc, char * argv[] )`
`95`	`95`	`{`
`96`	`96`	`confidenceFilter->Update();`
`97`	`97`	`}`
`98`		`- catch( itk::ExceptionObject & excp )`
	`98`	`+ catch( const itk::ExceptionObject & excp )`
`99`	`99`	`{`
`100`	`100`	`std::cerr << excp << std::endl;`
`101`	`101`	`return -1;`
`@@ -112,7 +112,7 @@ int main(int argc, char * argv[] )`
`112`	`112`	`{`
`113`	`113`	`imageWriter->Update();`
`114`	`114`	`}`
`115`		`- catch( itk::ExceptionObject & excp )`
	`115`	`+ catch (const itk::ExceptionObject & excp )`
`116`	`116`	`{`
`117`	`117`	`std::cerr << excp << std::endl;`
`118`	`118`	`return -1;`